merge of '4d697e87459daf170e9cdc2cf6e3cb5382c0a5b1'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Mar 2007 22:18:26 +0000 (22:18 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Mar 2007 22:18:26 +0000 (22:18 +0000)
commit04a36610bd004a7d1d40e12539515c88fca47e6a
treeddf19373b6321de3c6d5e237b265042ee1467d19
parent12c256dd88f6161d5bfcf82b19357e429bf2d596
parent685edbe4043c863b0b9b3f5b1ceb6e578fcf1c5f
Merge ... '4d697e87459daf170e9cdc2cf6e3cb5382c0a5b1'
     and '929600dfe3a47dcc3a6fa29011a5cac24759e500'