merge of 22665530c2919ac7f1d5892e662bb25164a13935
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 5 Aug 2005 01:10:30 +0000 (01:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 01:10:30 +0000 (01:10 +0000)
     and d30471d59dea9ad55b02e7745e9e96ee40c87846


Trivial merge