merge of 0a13f5649c4ff4f86d90c76b024acd06c136a588
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 14 Aug 2005 20:05:07 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 20:05:07 +0000 (20:05 +0000)
     and 5da8bfb1d71128589003d0bb6fe70a7a5faeaa0e


Trivial merge