merge of '4c2d3d5326458e250883b741a3c57e93fa3cabdd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 23 Apr 2007 17:17:20 +0000 (17:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 23 Apr 2007 17:17:20 +0000 (17:17 +0000)
commit4c38e16760ed8bcfbd7182f2631e8bc659f95bef
tree8a53f2b3d1ade08da81bb12e15668700f842635c
parent001fa95cbe05feec31fa77c5192c6b251cf28b7c
parenta9df5ade468b65513a1322184c6ba43e94181d0e
Merge ... '4c2d3d5326458e250883b741a3c57e93fa3cabdd'
     and '792b1b257756e328b12b4d731ec035b6d0c614b9'