merge of '3d704269a4c9fd224a47e37d4d32b325354912cd'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 17 Sep 2008 16:17:53 +0000 (16:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 17 Sep 2008 16:17:53 +0000 (16:17 +0000)
     and '4872b30764f9d90796ac966d1616d34ec0eceff9'


Trivial merge