merge of '2d845d0c3ff5c2927314d27ea9825e38bb773f6f'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 19:08:53 +0000 (19:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 19:08:53 +0000 (19:08 +0000)
     and '94f444b248e2cbc069ea3e5f2d467b3632db5d8c'


Trivial merge