merge of '3da2caa6a3dac230f20ffcd1b963e933f744dbfa'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Dec 2006 12:14:56 +0000 (12:14 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Dec 2006 12:14:56 +0000 (12:14 +0000)
commit259c9dcc32be71d937d39706255a6315ca2d6ce3
tree21d3bdaee7589fe6a57310032ac08b0233cc1855
parent682236a7ab13fa36caa6ee9fe96f1d899f1c85e6
parentbcec79858361aafd98fd275a40ed1f61833ca640
Merge ... '3da2caa6a3dac230f20ffcd1b963e933f744dbfa'
     and 'bde1fc713ea75f24b1ec8863e0cb558101ee3c06'