merge of '368c3f8ff3b1b9dcaff963660d353cc8e2739101'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 16:45:26 +0000 (16:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 16:45:26 +0000 (16:45 +0000)
     and 'f350641f3893143efec22c74299cdeeae73af124'


Trivial merge