Merge "Default to Java 1.6 when building and allow customization."
Xavier Ducrohet [Tue, 15 Jan 2013 21:36:31 +0000 (13:36 -0800)]

Trivial merge