merge of '11d1a9e6662c57de089d25a6900d5325f85d282e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 23:15:22 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 23:15:22 +0000 (23:15 +0000)
commit681a69f80a19ee11cb4077c6300c60c48ce4a91f
treec289efcb07f9370334ecdff33b0826d8e25278ad
parent12d48e2fdb36b8f02db189a370cf9c80fbd57189
parentb20edcd38445574cbdd667d5e82fb59572e4cab2
Merge ... '11d1a9e6662c57de089d25a6900d5325f85d282e'
     and '50d03f17a42a3854cd87f47ef75084da297d194e'