merge of '192efb6d3bfaa24757749bea21bc0515b1017108'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 5 Aug 2007 06:43:12 +0000 (06:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 5 Aug 2007 06:43:12 +0000 (06:43 +0000)
     and 'baf87732958baffc539a6e90858e6c2fe5972a1e'


Trivial merge