merge of 4844115704ef8669d1a44359d8e2f4aea0f4e0a3
authorTom King <ka6sox@nslu2-linux.org>
Sun, 21 Aug 2005 01:20:09 +0000 (01:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 01:20:09 +0000 (01:20 +0000)
     and c24a3542dea96cfac7343e6b921684d6459008da


Trivial merge