merge of '33fdbdf4099643f0cfc674de6234840544695efc'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 11:06:17 +0000 (11:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 11:06:17 +0000 (11:06 +0000)
     and '8cbbaefc242a3db691387a4cdb4aca694ee0215f'


Trivial merge