merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 16:05:50 +0000 (16:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 16:05:50 +0000 (16:05 +0000)
     and '77f81ea18669b5c79145faa5f0a96df1d7db3232'


Trivial merge