Merge of additional C++ pieces from Padraig
authorBrian Aker <brian@gaz>
Wed, 7 Oct 2009 17:42:25 +0000 (10:42 -0700)
committerBrian Aker <brian@gaz>
Wed, 7 Oct 2009 17:42:25 +0000 (10:42 -0700)

Trivial merge