Feng Xiao 042bfaf67f Merge remote-tracking branch 'origin/master' into beta-1 %!s(int64=10) %!d(string=hai) anos
..
google 042bfaf67f Merge remote-tracking branch 'origin/master' into beta-1 %!s(int64=10) %!d(string=hai) anos
solaris 3121a56ab4 Add file that was mysteriously missing from SVN tree. %!s(int64=17) %!d(string=hai) anos
Makefile.am b17ec3ca11 Down-integrate from internal code base. %!s(int64=10) %!d(string=hai) anos