merge of '607beb16c902d30bfd6adf75220b877b5611180c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:58:25 +0000 (08:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:58:25 +0000 (08:58 +0000)
     and 'a6836b405b63dd6c48b68274fbcb3c25bdde6c3e'


Trivial merge