Merge "Defer calculation of compile classpath until required."
Xavier Ducrohet [Fri, 7 Sep 2012 21:45:47 +0000 (14:45 -0700)]

Trivial merge