merge of 6cb03263ec6dc70d88e5694bd4793512b85564eb
authorJustin Patrin <papercrane@gmail.com>
Wed, 31 Aug 2005 23:59:37 +0000 (23:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Aug 2005 23:59:37 +0000 (23:59 +0000)
     and f4c52b5ab6f084f42b43ac432882d7247319c14e


Trivial merge