merge of 'c0f36dc5d04e2e5394903a4adce4023e9406e23e'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 20:36:03 +0000 (20:36 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 20:36:03 +0000 (20:36 +0000)
     and 'fcd1afad50b8cd806b06a49e3c34db85544ea088'


Trivial merge