merge of '64b4d4f122fe8531d9c08f7e98f633c6a0a1b171'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Aug 2007 17:47:18 +0000 (17:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Aug 2007 17:47:18 +0000 (17:47 +0000)
commit3617a5721139915827fa5e5ce430b6ababea3dff
tree9aca6c2c966a1bcbbcb6a4cb222751ee829676da
parent272fb90a1843dff5cdd5fad5b6ca2cdcfe174287
parent495a3b488896ec77499439d380c2156b32638873
Merge ... '64b4d4f122fe8531d9c08f7e98f633c6a0a1b171'
     and 'd839f215519a9a54cb807f39abfc917295da81f2'