merge of '746afc454473a4b341411a3247c01c9b83c5606e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 13:16:28 +0000 (13:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 13:16:28 +0000 (13:16 +0000)
commit5553eb15d63ea41aae25786c12913ccd1a0098b6
treed9e5f90d217bf9bb4890bed491d9ca0af8471441
parentcdba23dc285142750361fa95360e8c67d8351c9e
parent32da710375798fd730eff6a9f9a7a523ca13bed3
Merge ... '746afc454473a4b341411a3247c01c9b83c5606e'
     and 'ad51ca9ac30054f5463b958893cb1fd5986330d4'