merge of '4273804b598541555abb070bcb83ec503beaceff'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 17:58:05 +0000 (17:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 17:58:05 +0000 (17:58 +0000)
     and '99925725722e255ce214c4cfb61018cbf2729439'


Trivial merge