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)
commit5b93a55ca79e585be180880e0834051eec6b36f9
tree6e9e929c7fcd232dc4b748cc4052ed830f549de9
parent0616e87b7ef64d72c83b89844de5b4fa919a93f3
parent0e52c9073c31ddc1cdc23f0cbf867ad1c9e72524
Merge commit '0e52c9073c31ddc1cdc23f0cbf867ad1c9e72524' into cpp-migration

Used merge strategy ours to keep the manual renames and other work from
the previous commit.