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)
commit539c6c0d692ec97203e3591adb0f1d6727a19bbc
tree35849de500b6d99845c7fd35317491afebdfb4f1
parent3c80e0ccc141831b830963684660c83302ec88ec
parent69c2800abf825a7ea1a052cdfc3c8132ba63360e
merge of 5e74415fe54cee50b20464dc706894370da0035d
     and 88ec6577590d2a32da1f0361e44909b45f05899f