merge of 0875a62d1c0833c8b7734c612ecec134c8480059
authorJustin Patrin <papercrane@gmail.com>
Thu, 1 Sep 2005 17:01:09 +0000 (17:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Sep 2005 17:01:09 +0000 (17:01 +0000)
     and 9720740dd02d20f4f561a98498566085a8709d14


Trivial merge