merge of '1ba4060144f3549b5ec4424715ddde5fd9d0ad61'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 12:23:21 +0000 (12:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 12:23:21 +0000 (12:23 +0000)
     and 'a66740dc82701e8bcaf09d803b69b8601b7efb2d'


Trivial merge