merge of '09f0e748099ead0977ce917225e137b0a7d363ff'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 07:25:32 +0000 (07:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 07:25:32 +0000 (07:25 +0000)
     and 'cf75b3ea7e747b76ea3fa7398a6b401e1df0bfa6'


Trivial merge