alena 46c331b54b Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
2010-08-18 15:52:23 -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