merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 6 Feb 2006 02:47:59 +0000 (02:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 02:47:59 +0000 (02:47 +0000)
     and a99a1b40b0c3079093094218ed369481d70fecd4


Trivial merge