Vijayendra Bhamidipati 46fba35c99 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x ... Conflicts: core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java		2012-08-02 22:53:51 -04:00
..
cloud	Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x	2012-08-02 22:53:51 -04:00