merge of '7a4fc7be8df3eb6974944effcdca5a2bee336a9b'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 01:40:56 +0000 (01:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 01:40:56 +0000 (01:40 +0000)
     and 'd898916e8774cb2230ab7c226d0806ca2ec81f7f'


Trivial merge