merge of 'bf13c465f9f4c46132e74d7e9b93c2d1feb84ac6'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 00:13:30 +0000 (00:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 00:13:30 +0000 (00:13 +0000)
     and 'c44db3b9dd388ba7d6071532d6536625c571b3bd'


Trivial merge