merge of 5d7867f589e81409e209c32bee71ee1210d2b8a6
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 21:16:07 +0000 (21:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 21:16:07 +0000 (21:16 +0000)
     and f3ca1ea8fa5eb00d0eca178edefa5258362cfb66


Trivial merge