Merge branch 'nico/gss_constify'
authorLove Hornquist Astrand <lha@h5l.org>
Tue, 4 Jun 2013 04:51:10 +0000 (21:51 -0700)
committerLove Hornquist Astrand <lha@h5l.org>
Tue, 4 Jun 2013 04:51:10 +0000 (21:51 -0700)

Trivial merge