merge of d69e4956ab53fe34863509b1011261827ec1a31a
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 18:16:15 +0000 (18:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 18:16:15 +0000 (18:16 +0000)
     and f3f1f261ab9e71cd08507505938f11006f96c54d


Trivial merge