merge of '041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 15 Nov 2007 13:55:30 +0000 (13:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 15 Nov 2007 13:55:30 +0000 (13:55 +0000)
     and '7f5c53f2fa166aff72aba4062607f641a2050e32'


Trivial merge