merge of '7426dbd625295a2b15666267369a0733c5b2e3f8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:38:34 +0000 (19:38 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:38:34 +0000 (19:38 +0000)
commitf5decd63afe6bbe37565eca65db426b997c6f52b
tree4b3a0b0d0db7bcaaa7798c7c7fefd37ec294b515
parentbe846f1f60f21a11787bcb1b5469b948a1104c9a
parent0de74582bc1cda8dcea56c0d7a6504739056e34f
Merge ... '7426dbd625295a2b15666267369a0733c5b2e3f8'
     and 'dd2e25c6a29c15ebebb630124d0e86b9e4a00650'