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)
     and 3caeeb678d5bcfbb3e40443c54864cf7f7a3f44a


Trivial merge