merge of 2b96ead32d1d5f15cc59a0f801a519f3bf4644cf
authorJustin Patrin <papercrane@gmail.com>
Sat, 13 Aug 2005 00:54:35 +0000 (00:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Aug 2005 00:54:35 +0000 (00:54 +0000)
commit631ca0ec21d62a23bf2fdbee26a879d53d01df79
treee0da0780bb5bf5cf9857042f620e3842f5e055bb
parent73769ef9efc2a0868dfb0ec3e63530e5c2ab5b17
parentcef4e511868d109e5775ba2d21f7ef988b86f9a4
merge of 2b96ead32d1d5f15cc59a0f801a519f3bf4644cf
     and d34b6f078abca855ff8e570f35e7de8c121eebd0