Merge pull request #1277 from Yangqing/dev
authorYangqing Jia <jiayq84@gmail.com>
Tue, 14 Oct 2014 20:58:06 +0000 (13:58 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 14 Oct 2014 20:58:06 +0000 (13:58 -0700)
some more namespace cleaning.


Trivial merge