merge of '1f413a8fc168cbef64fe984af210e9d998cc3382'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 12:39:46 +0000 (12:39 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 12:39:46 +0000 (12:39 +0000)
     and '29d2dfa77e02cc2f8721d7954eb27c061486b2f4'


Trivial merge