merge of '7fa457f0b3692dd1829c417e2b50813397a844a7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 09:37:08 +0000 (09:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 09:37:08 +0000 (09:37 +0000)
     and '9aad32caf3729c944410f4ee750d845e7bde3232'


Trivial merge