merge with trunk r38787

This commit is contained in:
Xiao Xiangquan
2011-07-29 17:42:53 +00:00
247 changed files with 3542 additions and 1798 deletions

File diff suppressed because it is too large Load Diff