merge of '3a70542f110b6c428973d43745b25017469e203f'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 16:52:03 +0000 (16:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 16:52:03 +0000 (16:52 +0000)
     and '63b3be114577f06e728c111b2fda61626ac3faaa'


Trivial merge