merge of '1bc752476d60763f743d387738c05fb0a18060d8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 23:31:49 +0000 (23:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 23:31:49 +0000 (23:31 +0000)
     and '682b7f9bc2342713ca6c743f6c5d9edcb8f771b9'


Trivial merge