merge of 'd2f1a9f3ef64d23cec1e794848e1bb2ac1a92e63'
authorThomas Kunze <thommycheck@gmx.de>
Thu, 24 Jul 2008 23:37:01 +0000 (23:37 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Thu, 24 Jul 2008 23:37:01 +0000 (23:37 +0000)
     and 'ed4e5b420b127a2a4f722c324c8c61ee00caf977'


Trivial merge