merge of '5042c98815b59089f6a52790f0dba3c831b5590d'
authorThomas Kunze <thommycheck@gmx.de>
Thu, 27 Mar 2008 18:40:57 +0000 (18:40 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Thu, 27 Mar 2008 18:40:57 +0000 (18:40 +0000)
     and 'd1dfc5df9769c50ec5328454ab737f091f6c573f'


Trivial merge