merge of '667771aae40d71d3a640333d77db8501aaa679df'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jun 2008 15:13:53 +0000 (15:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jun 2008 15:13:53 +0000 (15:13 +0000)
     and '789d64c5f0950113dd422cc0a20a91d15947ad09'


Trivial merge