merge of '45bb832d6d0ed21a2ec91685ceb9dd7f847010bd'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Mar 2008 13:16:13 +0000 (13:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 3 Mar 2008 13:16:13 +0000 (13:16 +0000)
     and 'fbe4ca1964daebea4d7ba83733214f1cfa937b5b'


Trivial merge