Sync to waldi's subversion archive
12 files changed