merge of '2a5739a1dc2a54f1b7807bfd6e053e5b953b6d02'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 7 Jun 2008 18:32:46 +0000 (18:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 7 Jun 2008 18:32:46 +0000 (18:32 +0000)
     and '82ea7fb33a9e64c710458f33fd0c1649c08f7e01'


Trivial merge