merge of '05c935a7653c0d015e410ba1c92bd8909528d2d0'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 12:50:02 +0000 (12:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 12:50:02 +0000 (12:50 +0000)
     and '66afa730ae13c8e2f76b43a319e6c5be9e46c981'


Trivial merge