merge of '3dfeb44907c81f6def296b241d716d7c3644f45c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 21:48:44 +0000 (21:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 21:48:44 +0000 (21:48 +0000)
     and 'e5c1d0fc9d0187f657d627201c20a38d07617e1f'


Trivial merge