merge of 5381d172a27c05bdc841a6ebf55d265354d4e66e
authorJustin Patrin <papercrane@gmail.com>
Thu, 11 Aug 2005 17:23:26 +0000 (17:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 17:23:26 +0000 (17:23 +0000)
     and aa3fea219016be801feb5329869cd546a2334ec9


Trivial merge