merge of 5e74415fe54cee50b20464dc706894370da0035d
authorJustin Patrin <papercrane@gmail.com>
Wed, 17 Aug 2005 23:26:38 +0000 (23:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Aug 2005 23:26:38 +0000 (23:26 +0000)
     and 88ec6577590d2a32da1f0361e44909b45f05899f


Trivial merge