merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 03:24:12 +0000 (03:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 03:24:12 +0000 (03:24 +0000)
     and 1819e7c9879b392cfb2bdae2cd3d9d59c7e28a49


Trivial merge