merge of '9861e003b5708862835bc85f2778f44088811aa4'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 26 Sep 2008 18:42:26 +0000 (18:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 26 Sep 2008 18:42:26 +0000 (18:42 +0000)
     and 'ee41789a9c3e50ef34fdcef75b3487b4f3508184'


Trivial merge