merge of c05b7d0d68a0aebf878d9b85531b595e425dabaa
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 11 Aug 2005 20:22:47 +0000 (20:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 20:22:47 +0000 (20:22 +0000)
     and f53fd48079b012f260a4377a58c829aa1b21fe0f


Trivial merge