merge of 'e9e7550c64fb618ca229a869b9a5ccae9c437121'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jul 2007 14:28:27 +0000 (14:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jul 2007 14:28:27 +0000 (14:28 +0000)
     and 'efa64132e0fc0c02d7eb3be193b7df736281ee8a'


Trivial merge