merge of '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:38:48 +0000 (18:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:38:48 +0000 (18:38 +0000)
     and '9a389e1e5a5eaac66e8c921c1d1196c323a5030c'


Trivial merge