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)
commit5a105ac5def74e53bb856c24a0b408558402731a
tree4a366d9173844f172db001c80ffef96d163e2596
parent3a1f4cca35c4e7665932a4f574d43cc68d470281
parentb97b206fca43c75ac7098d358bf4c51cd3aed261
Merge ... '64380b55e0a69130483c56ed336e0c90d4c20c21'
     and '8e17b510698f5461cfc8ee04fe064a254f8b57ce'