merge of '4cdf2bbe0fc7b789810df60b02beff2b35c94877'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 10:48:54 +0000 (10:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 10:48:54 +0000 (10:48 +0000)
     and 'bacc3c96b6e486deae2dc054f9eafdfa75b6e618'


Trivial merge