merge of 'ca6fbf391be11c49f263e75d6b8ab2d4fd9211d6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 20 Apr 2008 12:33:50 +0000 (12:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 20 Apr 2008 12:33:50 +0000 (12:33 +0000)
commit5a50ff1bc37805a4e5dc16e941acba802ca499a3
treea86a100b1571efd0a2da71384f4cb9eca2cacb77
parent707a24c9fa7436af33d3c90e5d6d8efc0b1db99f
parentf8a2614f796127c1e4d8ad7398f4d4cf401d11af
Merge ... 'ca6fbf391be11c49f263e75d6b8ab2d4fd9211d6'
     and 'ff2abfa528baed226e80118e78794712e9f9395f'