alena 8825147f0d Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2010-08-12 11:41:02 -07:00
..
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00