merge of '37904b42e420b3ac5865f0832c2966dd7a6b91aa'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Apr 2008 17:42:02 +0000 (17:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Apr 2008 17:42:02 +0000 (17:42 +0000)
commit3d572b55dab462c7767044e03417b0f522a445a3
tree5dbe5cf02f591c102d1c793f98e500460018c161
parentb688dada8de8c2c9e8a42df102116b267f58b660
parent3ce1b56feb2e99d27bcf7911880dda6950136936
Merge ... '37904b42e420b3ac5865f0832c2966dd7a6b91aa'
     and 'b062a489deb15fe1826aeff1619f8599a060bfaf'