merge of '7131f28196073180061901d8749502f5acea9a0b'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jul 2008 23:09:50 +0000 (23:09 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jul 2008 23:09:50 +0000 (23:09 +0000)
     and 'd96c1b4121283c5dad1b8e0b2cafde6526d5b428'


Trivial merge