merge of '8c1998b111c4a146ffd919f37f11ce915dbfb6a2'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 13:18:15 +0000 (13:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 13:18:15 +0000 (13:18 +0000)
     and 'cfd22580a0b87e00837798107baafb4dc9f27b68'


Trivial merge