merge of 'ac5ffabbaf308649443ca65debd0f8c16b815675'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 19 Dec 2007 13:56:13 +0000 (13:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 19 Dec 2007 13:56:13 +0000 (13:56 +0000)
     and 'e5050c0a7e566f2f94affbc8a819e4f627eb0ae3'


Trivial merge