merge of 035c277be666bb4820b89ac86d5503b539c1d665
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 09:40:17 +0000 (09:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 09:40:17 +0000 (09:40 +0000)
     and eb6163e5b086184e50d3ecd9d48fccd8593c4827


Trivial merge