Min Chen 613a061977 Merge branch 'master' into vim51_win8 ... Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java		2013-03-04 17:32:52 -08:00
..
src/com/cloud/hypervisor/vmware	Merge branch 'master' into vim51_win8	2013-03-04 17:32:52 -08:00
test/com/cloud	Merge branch 'master' into vim51_win8	2013-02-27 17:47:10 -08:00
pom.xml	Merge from master and fix conflicts	2013-02-25 11:53:24 -08:00