merge of 4f3b068b42e8ca31b85ba27c4b0497b10dd7f320
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 5 Aug 2005 19:40:04 +0000 (19:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 19:40:04 +0000 (19:40 +0000)
     and db631e19abd4d2b1049a24b5d7ea623dc8673a99


Trivial merge