merge of '5fce36059a59f5f0270baf7f4ddbb9cb496ea312'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 4 Aug 2008 11:02:46 +0000 (11:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 4 Aug 2008 11:02:46 +0000 (11:02 +0000)
     and 'b68ae87d8ee0969bc8a91ea0ac326fb34c5eb9a4'


Trivial merge