Merge branch 'misc'
authorSascha Wildner <saw@online.de>
Wed, 3 Dec 2008 05:00:06 +0000 (06:00 +0100)
committerSascha Wildner <saw@online.de>
Wed, 3 Dec 2008 05:00:06 +0000 (06:00 +0100)

Trivial merge