merge of 31e4b6a6f2954655d18e0e65341dbd7053995cec
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 23 Sep 2005 00:36:12 +0000 (00:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Sep 2005 00:36:12 +0000 (00:36 +0000)
     and 68ad04146d2caa3296187babd7b1ea4128dac5f1


Trivial merge