merge of '1583a0f25533f1163ba206ab1b093a09bc5f17a1'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:42 +0000 (11:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:42 +0000 (11:38 +0000)
     and '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'


Trivial merge