merge of '059498b6c4f13f5dfa1e6c21a17742c9c506dc06'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Feb 2008 18:24:28 +0000 (18:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Feb 2008 18:24:28 +0000 (18:24 +0000)
     and '37c001885fbd1b66958b92b288dcb0c2e2024213'


Trivial merge