merge of '4161ac48e6849d2ce053bdbb00d74e709247fd18'
authorThomas Kunze <thommycheck@gmx.de>
Thu, 31 Jul 2008 14:32:53 +0000 (14:32 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Thu, 31 Jul 2008 14:32:53 +0000 (14:32 +0000)
     and '6542fbe2d509990c5d4b56b4adaf0df31a29c221'


Trivial merge