merge of 'ab9d95c9d897aff9c41ecadae47e79f56471d306'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Nov 2007 23:17:14 +0000 (23:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Nov 2007 23:17:14 +0000 (23:17 +0000)
commitf59b535f9088166e9d8c267bc5062ee5397d49e7
treead4bfb0c9d72f6c1905baf7a5c08be55c5a332a0
parentc1bac3cbd9fb1132ee3362fee5c69fe0cb1a03a5
parentb4d19be0d33cb3db728661434504bbada944c6a3
Merge ... 'ab9d95c9d897aff9c41ecadae47e79f56471d306'
     and 'ac4a07d54c50b6a1f43effcd0aa17f68d6735d18'