Diego Novillo Tue, 05 Jun 2012 07:22:50 -0700
A couple of merge conflicts this time.
Tested on x86_64. Diego.
