merge of '97d055550d55ba933c423fa657f7d63d18b81ed6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 12:07:30 +0000 (12:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Dec 2007 12:07:30 +0000 (12:07 +0000)
     and '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'


Trivial merge