Merge remote-tracking branch 'remotes/upstream/master' into harry
commitd4952d3e15d590b20ca3a95739706784ce35d24e
authorharry <haitao_gao@163.com>
Tue, 26 Jul 2011 07:27:28 +0000 (26 15:27 +0800)
committerharry <haitao_gao@163.com>
Tue, 26 Jul 2011 07:27:28 +0000 (26 15:27 +0800)
tree140cca6f55b2d5a39f8695ff2c49c376cb892d8f
parent2f0c92c6d4c766b013d871585606db723c646158
parenta528d0c0d447dd872859a831df0de4cea24b18d9
Merge remote-tracking branch 'remotes/upstream/master' into harry
com.zylin.embeddedcdt/META-INF/MANIFEST.MF