merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
authorJustin Patrin <papercrane@gmail.com>
Wed, 7 Sep 2005 23:26:21 +0000 (23:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 23:26:21 +0000 (23:26 +0000)
commitc1541e71a1a8dec1db567a9592bf7ad25776fccc
treefd8543f66ecaadaff216234eb0398fb2a8c8ebf8
parent3bd541d01751acee647413bc82ca1467c04210bc
parentd29d22276da39a6808ba18d61a6c1e72778066a6
merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
     and a1e17a5d7e46806b4e9ec3ded69b419eed479b4d