merge of '141cd340dd8e13975199b977f90b57e74e522707'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Feb 2007 23:30:47 +0000 (23:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Feb 2007 23:30:47 +0000 (23:30 +0000)
commit4d993f16c3b7cbd31fab591d83031b65deefd693
treea6eefeda8aa673ff5284d7ca9fddf327b6fd17fe
parentc2d082906d966d8d6f8017edd0a7cb7d378a6dbb
parent062e431f87e186a28ad1881bbc07b44ab3f034d0
Merge ... '141cd340dd8e13975199b977f90b57e74e522707'
     and '9912ae5933a91810d3c84c6647a19ac430cbd053'