Merge commit 'github/master'
authorduritong <peter.meier@immerda.ch>
Thu, 17 Jul 2008 18:49:09 +0000 (20:49 +0200)
committerduritong <peter.meier@immerda.ch>
Thu, 17 Jul 2008 18:49:09 +0000 (20:49 +0200)

Trivial merge