merge of '02c1db88e98d999e6fbb3fda096727c1fc8ad6aa'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 11:17:10 +0000 (11:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 11:17:10 +0000 (11:17 +0000)
     and '3a233f347017316b01a5399291d49424a3a4ba9f'


Trivial merge