merge of '28a8c519bdad5460acd375fdfc946ccc83177df6'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:07:56 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:07:56 +0000 (12:07 +0000)
     and '640195905df353942a1e0cde6e72a194c3a7434a'


Trivial merge