merge of '52d8aacaac0c09d6552f9d5d66a8cab47c65d4a7'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 16:58:43 +0000 (16:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 16:58:43 +0000 (16:58 +0000)
     and '903edcf621d6b2974f60aceef8e79c2816561136'


Trivial merge