merge of '239bf9442698f4db4f07daf718bd532f57820a9a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 16:19:56 +0000 (16:19 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 16:19:56 +0000 (16:19 +0000)
commit8abb2a0626641b7be5037d76e63e7ddadca87517
tree4eb3381da247257c6915eb8c2555e61af1636032
parent5efeb5d9a2b75be4bd69df1e87d84c11229fcc70
parentc2c7686b5bff9de5a423ac7d79ba9a910253d486
Merge ... '239bf9442698f4db4f07daf718bd532f57820a9a'
     and 'c0c18499bc6e8b5a120c2a0fb0abac48a79dbf54'