merge of '3961d9fa0932ee3f91d25b24350816ff1c3c7ff8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 11:11:46 +0000 (11:11 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 11:11:46 +0000 (11:11 +0000)
commite4f2b6e1d0bc68b738d9d1428a2ebb6c6d2014df
tree70ee4fd7e19c69f6893df7ed96ff439d5f09efbd
parent661edf7460f644cf3fe98c6c1d409a5b62570867
parent7253db0b88feba67ff9974c06ff06f0dff492bee
Merge ... '3961d9fa0932ee3f91d25b24350816ff1c3c7ff8'
     and '91d610fe22ec5f30832680d42abf443bcd99fe6c'