merge of '8aa66e0c1d1c620b98f480aa98ee13d966d94dab'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 17:00:35 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 17:00:35 +0000 (17:00 +0000)
     and '9ca12d4c1092b7f51c07aaf5538a0dd211ca0cfe'


Trivial merge