merge of '64a406be5c1819c15b47d3a2a9b566ff3f852846'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 20:53:09 +0000 (20:53 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 20:53:09 +0000 (20:53 +0000)
commit1e3db2356d5f2c1f963ffdb664f77d49b0fe02ca
treeebceb9bc2f11ae205ebb3e34cf46b31be0833c58
parenta87bb7b9c5d5d297d869f0952b0c01288a8726ba
parent202fc0686bff60974df5b9c1295a89ecb60b1c9c
Merge ... '64a406be5c1819c15b47d3a2a9b566ff3f852846'
     and '872186a5cf1f2d2cfc620d31ff4acf448471122e'