merge of '88dd6a801655485b76bb6d591c1f763d51ff47b8'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:47:15 +0000 (11:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:47:15 +0000 (11:47 +0000)
     and 'ea2a23cae4f4d939a07f699c39b603c4c2559ad1'


Trivial merge