merge of '1ebb8850a0ea6484319457a058a3ce4c3085d004'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 30 May 2008 19:28:03 +0000 (19:28 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 30 May 2008 19:28:03 +0000 (19:28 +0000)
     and '3d80d5e99ef4e42b4c77c24486de8fac537f1165'


Trivial merge