merge of '12f1208ddddebc7934d98fcac3f803d022a1ba28'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 14:58:16 +0000 (14:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 14:58:16 +0000 (14:58 +0000)
commita9f3690d41431d7ae61dc49f5d2147d4b584ee9a
tree289c19856fa9df72334e1ca7a91166bed77bab78
parent5a2af37231403de591565a0f0618d2969a7e2cc4
parentdf42d84d1ac1fc35e56fa66cf6559ce6ca2893d3
Merge ... '12f1208ddddebc7934d98fcac3f803d022a1ba28'
     and '8b21a69e52feb768f1d096aa78e44dd20ce3aed4'