merge of '64380b55e0a69130483c56ed336e0c90d4c20c21'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 25 Jul 2007 10:43:43 +0000 (10:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 25 Jul 2007 10:43:43 +0000 (10:43 +0000)
     and '8e17b510698f5461cfc8ee04fe064a254f8b57ce'


Trivial merge