merge of '471c60fc447650d2ed0a31e10815380ac513ee4a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 14:02:08 +0000 (14:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 14:02:08 +0000 (14:02 +0000)
     and '61c6959ed326b7433e68378046533cb8fa3b76dd'


Trivial merge