merge of '4447992dd58cf24ab0fb99dba811074b21c6aa2e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 24 Oct 2007 11:40:11 +0000 (11:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 24 Oct 2007 11:40:11 +0000 (11:40 +0000)
commit96839cb854eda459f0f6d05bc87a10e45856c17a
tree9b7f3d7c6148a796089ccd0edda99a7851e8425a
parentdf75d5f83cb51b2a9fcf6c2be39972122c7c9726
parentf42cfc355402f3d080706db20addfd4c06125694
Merge ... '4447992dd58cf24ab0fb99dba811074b21c6aa2e'
     and '978814b6112fa21afb021154c869d766d3db1175'