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)
     and '929600dfe3a47dcc3a6fa29011a5cac24759e500'


Trivial merge