merge of '630d91b636d9eb5ff3634efb7f7ed911fbd36602'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:53:53 +0000 (11:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:53:53 +0000 (11:53 +0000)
     and 'e0613a176614c74d38f49dfbdb46b6f368ef64ca'


Trivial merge