merge of '3c94d9db3ba91b1d4e037bacbd0bce84e35642eb'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 23:49:17 +0000 (23:49 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 23:49:17 +0000 (23:49 +0000)
     and 'e50fc707da1372d68e46edaf3a6915bf53f628b9'


Trivial merge