merge of '22e3927191bf5e773e6ac986169f1d250ad2902e'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:34:45 +0000 (11:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:34:45 +0000 (11:34 +0000)
     and '8a78637dc8745f64d6ed43a79d5920abbc1ec456'


Trivial merge