merge of '42b98a213761be9213d2d8438b252c41523837d5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 5 Dec 2006 12:28:35 +0000 (12:28 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 5 Dec 2006 12:28:35 +0000 (12:28 +0000)
commit10634dfbae6a9780c161adca89801e01d0b335da
treeaf6c46c026c4423881c8a26fe7487f806e8467ac
parent01d36dd186b8ad9009453198dedfd9fe88edfd93
parent9086b397b4131e23d3109b571cabb23b644c3627
Merge ... '42b98a213761be9213d2d8438b252c41523837d5'
     and '78bde69685836f66ab0435bf676c6e25cb1e8d1a'