merge of 391914d150c7b77d69474f4e85a3e0cbba8f5388
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Aug 2005 00:40:01 +0000 (00:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 00:40:01 +0000 (00:40 +0000)
commit6f3b94827bf6c9cef0685aeb305cf1211212f365
treeb87b460f324b23d498897f1ea4c6f1678b4f841e
parentd1bcf7aa9c4c1599f15ef8a869be0efe24e61093
parent20c8bf3d14ad0dce45fd6784d44bcb419ca2699a
merge of 391914d150c7b77d69474f4e85a3e0cbba8f5388
     and f4ec4ad70b55a146c0fe36c3cd2324d495e5e681