merge of '9e580a678f2605300358d2e2cf2eabb8d6e577b4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 01:10:32 +0000 (01:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 01:10:32 +0000 (01:10 +0000)
     and 'ed644d93511a8c52d17ad248a1866e866038da60'


Trivial merge