merge of '3a7743fc01171dc57c6955f1ffe9b6701dc58576'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Mar 2008 00:23:54 +0000 (00:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Mar 2008 00:23:54 +0000 (00:23 +0000)
     and 'a495e9cb4d40b047ae63d8cd7818e278baad8881'


Trivial merge