merge of 4d5b94a92602e5e257fa068651ecc2760fd67b44
authorJustin Patrin <papercrane@gmail.com>
Fri, 20 Jan 2006 06:07:28 +0000 (06:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 20 Jan 2006 06:07:28 +0000 (06:07 +0000)
commit682392d5a31f31de779b6556829a7451dbf6e8d8
tree799661b2c7d5b05ef1874bb69a5697d020404b74
parent9993d1748f9ef5c52aa0d6e3d3e0295248b921c6
parentea99bc2a74329de257bd3471bd13f47b36ed861f
merge of 4d5b94a92602e5e257fa068651ecc2760fd67b44
     and cccbd67a0ede7ae4d1db1f9c45f544ed28d0b294