merge of 47c741e249fa9fd872ab3d835c3c5b28a6897aae
authorTom King <ka6sox@nslu2-linux.org>
Sun, 21 Aug 2005 00:49:53 +0000 (00:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 00:49:53 +0000 (00:49 +0000)
     and 736b526a3d88e624bef7169dd8ff31366f58593f


Trivial merge