merge of 0c0e42d7342579eb1ee491a6b8a0a8610fe644c5
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 18 Jul 2005 21:43:11 +0000 (21:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Jul 2005 21:43:11 +0000 (21:43 +0000)
     and e02ee9b6b5e60c69a2a2ea80c0f196cf79009da7


Trivial merge