merge of '4f32005a985543bea4ff090bb1bc2b31df62ac89'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 May 2007 15:07:36 +0000 (15:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 May 2007 15:07:36 +0000 (15:07 +0000)
commit7658f59ea0680f908ce22fdfd81e33ac12953600
tree2e9e8541167538d2a82111243aca75523c101419
parent79a7ab287df99045228221469b018c7890954eae
parent22ea0bbf85859f58db2e26f7d07c8d71d8b07329
Merge ... '4f32005a985543bea4ff090bb1bc2b31df62ac89'
     and 'cd57d1ebc0ab6f1982195cae243401d5bd970b9a'