merge of '10c1f42dcafdbf24dd3f01c6d05fceb03c01fbed'
authorThomas Kunze <thommycheck@gmx.de>
Wed, 13 Aug 2008 00:28:33 +0000 (00:28 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Wed, 13 Aug 2008 00:28:33 +0000 (00:28 +0000)
     and 'bb625da55db7de93841c5fa9a5e896f298710cff'


Trivial merge