merge of 23548cd42cadf3483cc0fe532a297853c7daaaa4
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 12 Aug 2005 18:37:52 +0000 (18:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Aug 2005 18:37:52 +0000 (18:37 +0000)
     and 96b1952909f0144eb869df86e47875a3d3e8abd2


Trivial merge