merge of 595aea330d5742253d5d1cca25ea86a0c2814685
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 20 Jan 2006 19:33:24 +0000 (19:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 20 Jan 2006 19:33:24 +0000 (19:33 +0000)
     and 82bcdbbeb00c95318d566c7433ccdc8ac512737e


Trivial merge