merge of '2044642e8174795647f8a119435ed8787c7aff99'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:12:27 +0000 (18:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:12:27 +0000 (18:12 +0000)
     and 'cbe3c01bd8b49af467a1371cedad2d5cf2e6654c'


Trivial merge