merge of '5678fc5f68b2ae8af66e58e2166718c6700e23d9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:28:16 +0000 (18:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:28:16 +0000 (18:28 +0000)
commitf7c09d6ae335fa891b1a2e47a0715596f2a06472
tree7f05e6b7c489e710f92649e124e83c61dd2e351e
parentcdae4c0d753b265ab2a0462a6b42b9195d5c331c
parent3f7b97b5cb3650e3559748f10c6de64b24af07f4
Merge ... '5678fc5f68b2ae8af66e58e2166718c6700e23d9'
     and '6d039e9b03aa085fdfe8ca8ffa98cf3b212eabed'