merge of '53ed84a346013a17d2e419b516e0718f0a5ea922'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 2 Aug 2008 11:27:01 +0000 (11:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 2 Aug 2008 11:27:01 +0000 (11:27 +0000)
     and 'b53a69990c9003e5c1457b56d66b6f431cdb303d'


Trivial merge