merge of '4b8b5099e580dc976fa1eb82cf2b1d9e1dd32d3e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 10:59:14 +0000 (10:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 10:59:14 +0000 (10:59 +0000)
commit138e002f1e745f474b2252f50874076ec642505d
tree66ca13ee47ebf28237a7b5724f2e6e00e69df2a6
parent72821c3c1e7ab4941e22f2809eb3d58b04b292a6
parent6695656cb1e03fb90640561e2018239d1204e2b7
Merge ... '4b8b5099e580dc976fa1eb82cf2b1d9e1dd32d3e'
     and '8e601c26b709250cd8e3d1fe31370969df1f715a'