merge of '0cc484607260a013c209789586a468c114c20254'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 26 Feb 2007 11:01:56 +0000 (11:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 26 Feb 2007 11:01:56 +0000 (11:01 +0000)
commitf2ed01f2fa999207df71846d58f719e77f297e83
tree0eacba61a0c075edd2091dbc4e374fe596c5a358
parentc398f399bf7f2f674440dc78574b372b6498dd20
parente44b82a0670457f1440c84a81813e11767afd54f
Merge ... '0cc484607260a013c209789586a468c114c20254'
     and 'a3c39ebb70f0eef815ed0f3759e0be1354e112f8'