merge of '91d5e4c4066a9c5a157af1cecfa08fa827e70cb1'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Dec 2007 12:42:24 +0000 (12:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Dec 2007 12:42:24 +0000 (12:42 +0000)
     and 'cb2356de53f19e13c8306f4976bcf0f1b23b36e0'


Trivial merge