merge of '2c5d0d8be360397528c4d116b6cbfb655cba6778'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 12:17:17 +0000 (12:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 12:17:17 +0000 (12:17 +0000)
     and '7c12c95bf9c72db33fe18c1e84311fba909db68b'


Trivial merge