merge of '6bc2006eb8eff633170fcf544612bf6bcc7be7be'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 2 Apr 2007 15:57:09 +0000 (15:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 2 Apr 2007 15:57:09 +0000 (15:57 +0000)
     and 'ead450bbb0c7341954f358ef2d76fc6268c68846'


Trivial merge