merge of '355fab3d1867a0540055c0c85f9e5763ce090bfe'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 14:20:32 +0000 (14:20 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 14:20:32 +0000 (14:20 +0000)
commit85fec8b2edf978b8061fafcb5361bd110782326e
tree62f312349cccdd8e546a52499b55f22eedc51b61
parentb27b36c41fb203aff008cd35a37bb3f4ef1a0ed2
parente5675fd47e28484aa3a55b5410becc9cbd1daa38
Merge ... '355fab3d1867a0540055c0c85f9e5763ce090bfe'
     and 'adeec49ff94dd07cb7ad516e15f80ca85211624a'