Diego Novillo Fri, 26 Oct 2012 15:33:04 -0700
This merge brings the branch up to trun revision 192857. Tested on x86_64.
Diego.