merge of 'd7826d9cf7d1f91bfebd799820abbd0ce3128db9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 16:17:16 +0000 (16:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 16:17:16 +0000 (16:17 +0000)
commita942c0ff29316100eb4e03026738d397870dd568
tree5dffa1def6cdbc89aa53c80ede739f0017e86995
parent98f4c2d3847393f4e853c3f07a0ac4fc8ad3d9fb
parent0d444e0c7756f80a0dcfec73a18a77293baaf1bc
Merge ... 'd7826d9cf7d1f91bfebd799820abbd0ce3128db9'
     and 'eceb5780d848ff2a4a8e9d4a2310dfd39eb41b65'