merge of 9d518c785db1a806d81a8aacc799725428e542f4
authorJohn Bowler <jbowler@nslu2-linux.org>
Wed, 4 Jan 2006 01:24:34 +0000 (01:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Jan 2006 01:24:34 +0000 (01:24 +0000)
     and d5e1bc9b9d3db68b87987517770deb9a389f8333


Trivial merge