Merge branch 'cleanup-c++-code'
authorPetri Lehtinen <petri@digip.org>
Thu, 4 Feb 2010 19:12:36 +0000 (21:12 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 4 Feb 2010 19:12:36 +0000 (21:12 +0200)

Trivial merge