merge of '15eabf62626d7b5980c5f03a6eb67c7cf0c49ccb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Mar 2007 05:40:26 +0000 (05:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Mar 2007 05:40:26 +0000 (05:40 +0000)
     and '376139a78fd1210e26df4a08e3bb9e37fb09c274'


Trivial merge