Merge branch 'c++-enhance-proxies'
authorPetri Lehtinen <petri@digip.org>
Thu, 11 Feb 2010 19:06:19 +0000 (21:06 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 11 Feb 2010 19:06:19 +0000 (21:06 +0200)

Trivial merge