merge of 'a11f318a90beef34d84711b348b891eddfabc2bf'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:08:05 +0000 (12:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:08:05 +0000 (12:08 +0000)
     and 'a4b1e7b65833194a48909d836e87a913dbbe3c66'


Trivial merge