merge of '414cac1c77ff9fa2877bf185b1fb201f034ee108'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 10:58:00 +0000 (10:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 10:58:00 +0000 (10:58 +0000)
     and 'bf8b52c7c7ffdfe7cb88423cc23d4eeb9c573c2f'


Trivial merge