merge of '6951a4bf0c57a677b8f2cdf1144402fe1358e3e1'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 18:31:14 +0000 (18:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 18:31:14 +0000 (18:31 +0000)
     and 'a76f71ae5f89679c6f4ec02e1b1b05e22a7c5905'


Trivial merge