merge of 71128e6c89c536ab0046ade14dfc6c2b2dc7b2e4
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 22 Sep 2005 19:48:50 +0000 (19:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 19:48:50 +0000 (19:48 +0000)
     and decc2032888381bf591149b1c37d124ec383c249


Trivial merge