merge of bc7ae097617d5f492c1f50dccf43a2f36147110a
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 23 Jul 2005 00:13:26 +0000 (00:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 00:13:26 +0000 (00:13 +0000)
     and f46a71dcce351ec2fd3d4652afd3baa26dc1cc5b


Trivial merge