merge of '439075141b0d6ffd64c201829b5e172db68ef97e'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 15:47:46 +0000 (15:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 15:47:46 +0000 (15:47 +0000)
     and 'f2cd2a30cb6f115f92cd1c1e84bfb040f0a12597'


Trivial merge