merge of '602d19aed9d02d401cb3e6abec9352a3eeb76eb6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 10:21:12 +0000 (10:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 10:21:12 +0000 (10:21 +0000)
     and 'b55671f42355ca7d007393b54ff28e7bb5396af5'


Trivial merge