merge of '0f116f3500c10a0c6df76297f3ab887bebb2d8ad'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 19:54:29 +0000 (19:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 19:54:29 +0000 (19:54 +0000)
commitbc5e0f85b578dfcf823c614f50df2d47a1bfade7
treeffc6e480e5b5ef0b4211c85ac3e89344c65db203
parent05322108768afa2e5a439f99bfd6f6431141e0f8
parent394fadfbbe27b53e829489d8e5d462df904e6bd8
Merge ... '0f116f3500c10a0c6df76297f3ab887bebb2d8ad'
     and 'dce598404f82b5e5bef1adc1cc1d91fbfc2aecc2'