Merge branch 'misc'
commitf0f666275b69db7b2846073f35fd68e6e857fa12
authorSascha Wildner <saw@online.de>
Wed, 3 Dec 2008 04:53:52 +0000 (3 05:53 +0100)
committerSascha Wildner <saw@online.de>
Wed, 3 Dec 2008 04:53:52 +0000 (3 05:53 +0100)
tree07776c08ceab117bfb4a859fda192df50499178b
parent02a112e67533ef38cdb99bd93b46b3232f0f0a44
parent167c1ad25731f1bcd014e75954e2eaa412f827a2
Merge branch 'misc'