merge of '3cbc7c235df8720637ca4f1cfe3886d015edcd18'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 10:34:06 +0000 (10:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 10:34:06 +0000 (10:34 +0000)
     and '414c46b290373923c8fbd2f140667276dc33aa54'


Trivial merge