merge of '353149ddd8838914505a55ea3b29c0e9a586313f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 23:26:27 +0000 (23:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 23:26:27 +0000 (23:26 +0000)
     and '908f030111fed03649b332c926739ffdd2d5eeb1'


Trivial merge