merge of 4228f36c4f155245f64f7cb36ab837dabdc3b85e
authorMichael Lauer <mickey@vanille-media.de>
Tue, 24 Oct 2006 11:26:16 +0000 (11:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 24 Oct 2006 11:26:16 +0000 (11:26 +0000)
     and a7356e337a26583fd1cde090a1a5ec62c75511aa


Trivial merge