Diego Novillo Tue, 29 May 2012 07:30:50 -0700
This merge brings cxx-conversion up to rev 187927.
Tested on x8_64.