merge of '2fe954cb15fbe7a382c756c05c35cb5dfbb34350'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Feb 2008 04:20:09 +0000 (04:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Feb 2008 04:20:09 +0000 (04:20 +0000)
     and '45375d79ec784666e2d1135d3d602845ed57d669'


Trivial merge