merge of '8cdbac2cfd79ec0991df26af46cfe94d1a93ddfc'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jul 2008 14:10:02 +0000 (14:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jul 2008 14:10:02 +0000 (14:10 +0000)
     and '9c35b872809df23ffed33f2e6d3487f5ebde5390'


Trivial merge