merge of 'bdcb6216662449a5df98e3180f1fafcd2fb13858'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 13 Sep 2007 01:12:57 +0000 (01:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 13 Sep 2007 01:12:57 +0000 (01:12 +0000)
     and 'ccee86b315f75cb78aaeb21eeb14a0b85ad9dec9'


Trivial merge