merge of '208f1ed94f96d48ebd0a914e436fb7a6e203f681'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 22:09:25 +0000 (22:09 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 22:09:25 +0000 (22:09 +0000)
     and '377e4d7bcf91440bd806ee920d1b7ff72c44b991'


Trivial merge