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


Trivial merge