Diego Novillo Sun, 17 Apr 2011 13:49:18 -0700
Merge google/integration into google/main at rev 172609. Tested on x86_64.
Diego.