merge of '7286f9ae22f31fb7a8b5f1180a47ea9c0d0b8684'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:00:38 +0000 (01:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:00:38 +0000 (01:00 +0000)
     and 'c288a6b0de570eee76783fd7b34698c396cd22fb'


Trivial merge