Merge pull request #1269 from Yangqing/dev
authorYangqing Jia <jiayq84@gmail.com>
Mon, 13 Oct 2014 20:56:26 +0000 (13:56 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Mon, 13 Oct 2014 20:56:26 +0000 (13:56 -0700)
Minor change: some namespace simplification


Trivial merge