merge of '3f9f819e47a2fc2f9907b83c1461e246b481c0ef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 23:10:24 +0000 (23:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 23:10:24 +0000 (23:10 +0000)
     and 'd0db91315cbeafd98f54379b3f02930424ce8f0d'


Trivial merge