merge of 'bfad7eb7e40db9284b9271f1a40a8fa4ec870886'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Mar 2007 18:06:15 +0000 (18:06 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 11 Mar 2007 18:06:15 +0000 (18:06 +0000)
commit6161611fd721f20e776b794bba45102bed10a9c9
treee5dc96e58c295bf3fff58a3b61b14bde58466fae
parent3de7894a5577fbf7359c2d5462dce0863a8c2942
parent92708f5323fb8ab3731f331bab971417dc95ea53
Merge ... 'bfad7eb7e40db9284b9271f1a40a8fa4ec870886'
     and 'cf1509616612351c585abcb7745d78bb211e442f'