merge of '33019e0e6235ec885c91256837a062fa55cae440'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jun 2007 04:01:15 +0000 (04:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jun 2007 04:01:15 +0000 (04:01 +0000)
     and 'a61aba8a057f0b182431d754bb7d4798c75ebd37'


Trivial merge