merge of a0401b9f09376ea2c7d6eb10ff1ccfb84ec7649c
authorJustin Patrin <papercrane@gmail.com>
Thu, 11 Aug 2005 22:56:38 +0000 (22:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 22:56:38 +0000 (22:56 +0000)
     and a0a93c4cb9609431f78a0188791c0cd9574687c9


Trivial merge