Also fixed some javadoc warnings. Original author: raphael Merged from: //branches/cupcake/... Automated import of CL 143199