merge of '5b9a87ae38dcfb5f93e5ef675666514e1e0a7ed0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 09:06:56 +0000 (09:06 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 09:06:56 +0000 (09:06 +0000)
commite2a4d85b3891006d979774eee012a44c14e1e55e
treeae4ef1cd7be143c1cbf125ed40fe8364d9535224
parentfbb28e1fb0793ae2647060b09e353d322693e12d
parent9534a5ea1e01133ed20093a8b3f24ddd071d9070
Merge ... '5b9a87ae38dcfb5f93e5ef675666514e1e0a7ed0'
     and 'c58d6c1db9e081a653d853df73c96b63db90069a'