Merge commit '0e52c9073c31ddc1cdc23f0cbf867ad1c9e72524' into cpp-migration
authorTeemu Murtola <teemu.murtola@cbr.su.se>
Sun, 26 Dec 2010 16:26:31 +0000 (18:26 +0200)
committerTeemu Murtola <teemu.murtola@cbr.su.se>
Sun, 26 Dec 2010 16:26:31 +0000 (18:26 +0200)
Used merge strategy ours to keep the manual renames and other work from
the previous commit.


Trivial merge