merge of 'a861d7ae9f7e1ef52c56fcb6017fe9b7c48dc72b'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 01:17:48 +0000 (01:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 01:17:48 +0000 (01:17 +0000)
     and 'faf33dcbfd35dd67bb0aea23b73e2eed42cd7226'


Trivial merge