merge of '2af4eb2f21c9d1e49169b71a6ca239d7fcf48813'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 28 Mar 2008 14:47:14 +0000 (14:47 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 28 Mar 2008 14:47:14 +0000 (14:47 +0000)
     and '364678033dd32f6fbcbfefe35ee6db54abedb087'


Trivial merge