merge of 'b8e71a10da8ae7461c4c3197576a05bcda913299'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 13:25:44 +0000 (13:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 13:25:44 +0000 (13:25 +0000)
     and 'e693b2bf0018d4d35c75103648c29805e597c2c9'


Trivial merge