merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Sep 2007 20:15:38 +0000 (20:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Sep 2007 20:15:38 +0000 (20:15 +0000)
commit09a497b2fd5df58ac5b9deec9830b3a9bbc6342f
treeb4364dcbf548cd51ad941e94920844cd1f79855b
parentcb028129efb450efe57757b2ea73e8cd827bf59d
parent5b01b27522b32b4ee14588764768a33ff7312a3a
Merge ... '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
     and 'a12d2158881e274d028f6fb907b2bd832647e870'