merge of 58b70d443320302d28d40f3bbd27c219a60956cb
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 21:15:39 +0000 (21:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 21:15:39 +0000 (21:15 +0000)
     and 9f2634a3c17a2dc22fa4a956cc26a1e6db232dc3


Trivial merge