+Re-scomped with -javasource 1.5 and -compiler pointing at 1.6
Authored by: danmitch 2011-12-07
Parent: [r1055]
Child: [r1057]