merge of 52ebd988f59f6be0851649e3d117ae3734e87b4f
authorJustin Patrin <papercrane@gmail.com>
Sat, 11 Feb 2006 21:33:12 +0000 (21:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Feb 2006 21:33:12 +0000 (21:33 +0000)
commitb91a2a99171cef31ac7a7e4e277fde656f0efaca
tree4de6df67d2f264738c59cdec89616aa94d52c68f
parent93b28d1fb7d8de6bfc78a01108ea45c31718ab50
parent1f601d09b53593fc41d3bc7f1f30fac2a4376fdc
merge of 52ebd988f59f6be0851649e3d117ae3734e87b4f
     and ab5c1cdb1ec2745a8a648c55a1738863c84ce2a6