merge of 'b091298f5a7429063b7fc43393d70a224e4a5d99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Aug 2007 17:47:51 +0000 (17:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Aug 2007 17:47:51 +0000 (17:47 +0000)
     and 'b7ecd3fb6f5dac44f9fe8b851242aa671d666c3a'


Trivial merge