merge of 8982ebf16224df4ea5b5e7852e63112f004bbd33
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 22 Sep 2005 20:48:29 +0000 (20:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 20:48:29 +0000 (20:48 +0000)
     and a89d5956fffe61c303ff6a056247b5569871e5c5


Trivial merge