Merge branch 'const'
authorRobert Bradshaw <robertwb@gmail.com>
Wed, 19 Sep 2012 06:28:46 +0000 (23:28 -0700)
committerRobert Bradshaw <robertwb@gmail.com>
Wed, 19 Sep 2012 06:28:46 +0000 (23:28 -0700)

Trivial merge