merge of '9fbffdcb9794d661ec2be0360be70be480cdaf93'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 14 Apr 2007 11:17:43 +0000 (11:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 14 Apr 2007 11:17:43 +0000 (11:17 +0000)
commitf10862651a02da23e85593197e29915ebad11017
treef690848a1d05a96aac6e4a69907755dbbb5dc4d6
parentcb50079f5dacdbd1d35966e44d146e680b1627d9
parentd1116bea33148bdf8162b059528124aa09e0b0d2
Merge ... '9fbffdcb9794d661ec2be0360be70be480cdaf93'
     and 'f0746e43aaebc1cf80256d1678906f3942922829'