merge of '65810adbf4ff2f65fbd9977be64a8fad919e38f8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 18:10:38 +0000 (18:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Aug 2007 18:10:38 +0000 (18:10 +0000)
commit3376d25beeaa1678251406e0bc759793403cc055
tree5016450aede8d269218000d153a8ad012f9b5d94
parent56026f0f23ccd5b8f2f0b921f080af1e22aff66d
parentea183e07ed741bff4898ebf64cde9bc3393a1a50
Merge ... '65810adbf4ff2f65fbd9977be64a8fad919e38f8'
     and 'ebe549ec8cb67b1109f8e20a4d0f027c0e5dcb2f'