tree 8aaba414fcf3ac64a90b69d2e7b04397c9950db8
parent 812e986e88e896cb625d98dd9ea4c39af1423b08
author zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> 1237415242 +0000
committer zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> 1237415242 +0000

Merges changes in r214 from branches/release-1.3 to tags/release-1.3.0:
svn merge -r 214:215 branches/release-1.3 tags/release-1.3.0