Merge commit 'github/master'
authorduritong <peter.meier@immerda.ch>
Sat, 19 Jul 2008 15:29:54 +0000 (17:29 +0200)
committerduritong <peter.meier@immerda.ch>
Sat, 19 Jul 2008 15:29:54 +0000 (17:29 +0200)

Trivial merge