merge of 'af88183f8a1fc8ac383ef392272c0f8dde354024'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 17:39:57 +0000 (17:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 17:39:57 +0000 (17:39 +0000)
     and 'c6caaa43c1d9168b1c89bc83e7ec1c38ca284d88'


Trivial merge