merge of '14928573b347a6b1c9dbb7c902a5f88108e50372'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 17:07:48 +0000 (17:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 17:07:48 +0000 (17:07 +0000)
commitb18abe6da7888a670588b90cbd0a7c71f3aeb9a4
treed41761f5521b3130ee187110ea17f71e29267c55
parentfe8d0333dcdc7a2ed7c8aa9aa13c58398402fe9c
parentce7860270c0a535a347fd12c3dd70c19476b0653
Merge ... '14928573b347a6b1c9dbb7c902a5f88108e50372'
     and '52580cee5bed5696a392f8553aaab20b2c6af883'