merge of 0495eaa1fec4c7cc4ca6223fd48d22ce3718a65b
authorJustin Patrin <papercrane@gmail.com>
Thu, 25 Aug 2005 18:43:57 +0000 (18:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 18:43:57 +0000 (18:43 +0000)
     and 92a32d63c25e0613e8a8bf6c1135383137f21b08


Trivial merge