merge of 2f5ec9223fa71bbca67ec2ecb5e1b62ddbc450d4
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 14 Aug 2005 20:06:46 +0000 (20:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 20:06:46 +0000 (20:06 +0000)
     and ca933b7b66ded3fc8d2fbdd358a83e93f951f920


Trivial merge