merge of '6bf4895c5f2152a0cafda3d402b7b1190cd8469a'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 22:04:41 +0000 (22:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 22:04:41 +0000 (22:04 +0000)
commit4d26a6472e6564031c78d8a9bae2c1effb1cd67a
treed8e5e596454c80cbf2b030df06aa83f16c76a61c
parent243024aa42ea8d99bd842dc944a01287f73bd99a
parentd58b5600c32e8ced1b777de5216c8265a9d35a16
Merge ... '6bf4895c5f2152a0cafda3d402b7b1190cd8469a'
     and 'd5b50f42c0a46a86e2e6458ba37bf575cad2f411'