merge of '59a04ff85afc00ee91a9cf8dd60c29dca70ba478'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 16:47:10 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 16:47:10 +0000 (16:47 +0000)
     and '81b1167cd86ec3accb443d61ad4c7eb796461e8f'


Trivial merge