merge of '0a2d2ceb69c74512829d68b0e0a1d8854d70773b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 2 Jul 2008 13:16:46 +0000 (13:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 2 Jul 2008 13:16:46 +0000 (13:16 +0000)
commit66585cc0ca047d99e445d9f56671ccec19b03ddd
tree547a1c648f40023b59ebf7c4cb7c73855986466c
parent5cf297cca8e74bb8909d2581763d13e160871cf7
parent102eaa322eb18302832a1059e8ba1f12aeb5a679
Merge ... '0a2d2ceb69c74512829d68b0e0a1d8854d70773b'
     and '47f50b0caeb4ce0ed68e21f71ad68ae79e309be3'