Merge branch 'misc'
authorSascha Wildner <saw@online.de>
Fri, 12 Dec 2008 09:20:06 +0000 (10:20 +0100)
committerSascha Wildner <saw@online.de>
Fri, 12 Dec 2008 09:20:06 +0000 (10:20 +0100)

Trivial merge