merge of '81c87e5195c33ef6ed29868b074d16176f177c69'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Aug 2008 23:08:23 +0000 (23:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Aug 2008 23:08:23 +0000 (23:08 +0000)
commitf75e5aedb17628e46420aaff3d460934056c42d2
tree266f0b5375e330f470a3c9f69c30c4880bc564b3
parent972009cac266e7ae4c9a42a6af1f50e664a2e03f
parent3e51d1d516000a33f877a536cdee8b142a4472c8
Merge ... '81c87e5195c33ef6ed29868b074d16176f177c69'
     and 'b276360ffd472780ff8a2ecb78b15b2b96691746'