merge of '2b4e1c7a35c118cf363c771f015c4fdfa5f84731'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 23:32:09 +0000 (23:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 23:32:09 +0000 (23:32 +0000)
     and '36fe2f5bf87b5a8eedda174012a2e93f8bb5a8f5'


Trivial merge