merge of 55fefa60fda5100c3bc1a4ecf8d48d0ea4bb9193
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 26 Sep 2005 23:09:24 +0000 (23:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Sep 2005 23:09:24 +0000 (23:09 +0000)
     and bbe482d809300bb4339549751dc0074a94dd6e6e


Trivial merge