Commited from DTAL Wed Jan 30 21:55:50 GMT 2013
Merge branch 'master' of https://github.com/jxitc/AcsProj