merge of '4eb9d3b0c9a35463c247aadd30af658fd1c31fc4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jun 2007 14:39:22 +0000 (14:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jun 2007 14:39:22 +0000 (14:39 +0000)
     and 'c8e2ca01dd2daa1dda571be33da5b035bfdb6433'


Trivial merge