merge of '50409e326e2ff8f7448fc8f41f187589486432cb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 May 2007 07:09:57 +0000 (07:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 11 May 2007 07:09:57 +0000 (07:09 +0000)
commit2550ac0a2fbb8aca072bc67e565e76a66aab7b20
tree9218c7e80d9fe4f3b79bc51b3d3b5e57b91941dc
parent48073735fb3eba44a8b4d6141e5cf5e330a5601c
parent10c7149170c9123592c43909c3443b58ff71d372
Merge ... '50409e326e2ff8f7448fc8f41f187589486432cb'
     and '89c62d328d708a711c2c20ac45d03d6fd73aef69'