Merge "Fix setting up classpath with jars from libraries."
Xavier Ducrohet [Fri, 14 Sep 2012 00:15:43 +0000 (17:15 -0700)]

Trivial merge