merge of '7c7739053ba5cdf8bff6f5a8f4fbc67e37462db4'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 17:34:13 +0000 (17:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 17:34:13 +0000 (17:34 +0000)
     and 'e6a459c55425abe66caef6b80f6fab95fb04c868'


Trivial merge