merge of 'b7526fb97989513a85163a319269dac86b19a85c'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 00:27:56 +0000 (00:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 00:27:56 +0000 (00:27 +0000)
     and 'e0d71aa6a8738794986f1833521cdcb515df1ae7'


Trivial merge