merge of 'a91112c3e784fea18d755b2f4d125e144e41fdc8'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 28 Mar 2008 17:03:37 +0000 (17:03 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 28 Mar 2008 17:03:37 +0000 (17:03 +0000)
     and 'fc4b712c9e56d0a95e47daae16669dc117b1d181'


Trivial merge