merge of '96d7870254b4856e54bb9917bf206a20c8a2143b'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 18:06:56 +0000 (18:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 18:06:56 +0000 (18:06 +0000)
     and 'af1fa1ff21fbbd82c0b12c754f37cc126ee70b06'


Trivial merge