merge of 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 2 Dec 2007 16:05:32 +0000 (16:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 2 Dec 2007 16:05:32 +0000 (16:05 +0000)
     and 'd045039e1aba07c5bb52c9acf9236d6bb0cf1831'


Trivial merge