merge of '70e5cb5b57b8b8e92379709529ff8e0b02dd4f35'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 02:10:40 +0000 (02:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 02:10:40 +0000 (02:10 +0000)
     and 'd8d258ba37698b02258816d08d8b88b5fa957d23'


Trivial merge