merge of '0ee4237d44d0abae9c6a87517d5a56c8a8fb110e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 17:47:38 +0000 (17:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 17:47:38 +0000 (17:47 +0000)
     and '410cd788a5109a93ca33f19e5fd6f567a6e8adef'


Trivial merge