merge of '3b04f9d33d900f95c8814c78ad7693a4bd404ded'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 8 Jul 2007 18:53:15 +0000 (18:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 8 Jul 2007 18:53:15 +0000 (18:53 +0000)
     and 'f6a57e1a7e63e62b04f74e02986c4cc6c30ece2a'


Trivial merge