merge of 06709bc13077018369389fc415f45693986fa694
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 6 Feb 2006 18:36:12 +0000 (18:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 18:36:12 +0000 (18:36 +0000)
     and 1fe8f28c2e6a22a4a5579472503b814874f1eebf


Trivial merge