merge of 'bc23cf53ce799d3e52d33fa659150040636e3134'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jan 2008 17:02:51 +0000 (17:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jan 2008 17:02:51 +0000 (17:02 +0000)
     and 'c0a3e474625678b13727e12b833983f6e3389de1'


Trivial merge