merge of '2940479bcfd956eef260cc704db455cc804377b8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 20 Aug 2007 11:26:49 +0000 (11:26 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 20 Aug 2007 11:26:49 +0000 (11:26 +0000)
commitfc5fa44544b61fe20011986480b945eb4ff7f20a
treeaa0647d0b3aadc160c72f7c2f02d977033dfc2da
parent71e917c19c83c7042eca136c30bb97eb5ac3f6b0
parent60fcde6fba18416aea7ec3583e5d9b4fc5457415
Merge ... '2940479bcfd956eef260cc704db455cc804377b8'
     and '46647ef87b7a613022c3f8fb0a5c5b1e117aecab'