merge of '2eadd91fadb429f90d6d5b0714a7265811f206b6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jan 2008 01:09:50 +0000 (01:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jan 2008 01:09:50 +0000 (01:09 +0000)
     and 'a17466e62ff1000054de2b883169fb332ceb8d66'


Trivial merge