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)
     and 'ac4a07d54c50b6a1f43effcd0aa17f68d6735d18'


Trivial merge