merge of '0cb8f2ce480fcc07aa6c28de994811e8b223d81c'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 11:44:27 +0000 (11:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 11:44:27 +0000 (11:44 +0000)
     and 'e32e0321deebf52172fbb0d967704f72299ab0c1'


Trivial merge