merge of a0c6e9d622b3b7fa68f6ed104d4006492634cb1d
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 2 Aug 2005 00:39:10 +0000 (00:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 00:39:10 +0000 (00:39 +0000)
     and d5ca2d9089d0a71c3f006b3ef5b5a276d383f1c1


Trivial merge