Kishan Kavala 89779cceb8 Merge branch 'master' into regions ...

Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql

2012-10-03 14:09:01 +05:30

..

com/cloud

Merge branch 'master' into regions

2012-10-03 14:09:01 +05:30