merge of 0d6d444e1b9f86d0b1f42ce130e9287440bd927f
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 6 Oct 2005 06:42:07 +0000 (06:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Oct 2005 06:42:07 +0000 (06:42 +0000)
commit50c30aac02764438f18b3deda6113f25bbb36533
tree17b9c6166a195b38aa15bbdb5f929ccd6fe94f4d
parent4f994e1cd468a707f90a93315771521f4bc3041b
parentb1706eff91e1c71489b95119b6e09dcba613175d
merge of 0d6d444e1b9f86d0b1f42ce130e9287440bd927f
     and 3caeeb678d5bcfbb3e40443c54864cf7f7a3f44a