merge of '5678fc5f68b2ae8af66e58e2166718c6700e23d9'
commit0df9a39f3bd2d6c923d76e4e4bc23b999043d263
author <oe@openembedded.org> <>
Thu, 15 May 2008 18:28:16 +0000 (15 18:28 +0000)
committer <oe@openembedded.org> <>
Thu, 15 May 2008 18:28:16 +0000 (15 18:28 +0000)
tree6f18725fa545c33db239a9b8be1c1206268b022d
parent672a075cc81b891e5ffcac8ff51fb85d6665a977
parenta7b4c32d46d1480c4bc5869fda95f4f8ddc17fd6
Merge ... '5678fc5f68b2ae8af66e58e2166718c6700e23d9'
     and '6d039e9b03aa085fdfe8ca8ffa98cf3b212eabed'