merge of '2436a8cf0f1e75038f7abdde2b335ec87e4787c2'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 14 Jul 2007 11:30:13 +0000 (11:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 14 Jul 2007 11:30:13 +0000 (11:30 +0000)
commitd65919f84c141d69d3b2b11374df99fdae13ff4a
treeecd1eb5fa2edb982a5320ef0fc2c8f5323f4062e
parentd1a9129a306a07ade4ca50287345f4e950d308df
parent92df2001b5459e00f493ca5b61a5b849ddb24055
Merge ... '2436a8cf0f1e75038f7abdde2b335ec87e4787c2'
     and '5435d6cca1d4e6591c2820a722218a23661342bb'