Merge pull request #1786 from xianjiec/dev
authorJeff Donahue <jeff.donahue@gmail.com>
Fri, 23 Jan 2015 03:45:34 +0000 (19:45 -0800)
committerJeff Donahue <jeff.donahue@gmail.com>
Fri, 23 Jan 2015 03:45:34 +0000 (19:45 -0800)
fix bugs by adding const


Trivial merge