merge of 'd1370b15e175b1b3cf370e0d9464e6db9893326a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 10:29:19 +0000 (10:29 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 10:29:19 +0000 (10:29 +0000)
commit94f17152702e554ed343d673cf75de800860361a
tree4c874aef6e084a8bf579b05de86443ff7d7c1944
parent26b5953867988b925357fc8c8168785dd75dee03
parent4d0fccc940c8bffe5eb8e384d622e9db1bb9431b
Merge ... 'd1370b15e175b1b3cf370e0d9464e6db9893326a'
     and 'd49c7a5854a653df449e557102e3fbec0192fa4e'