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
..
bindir	db: Give option to specify region id while setting up database	2013-02-27 15:03:14 +05:30
db	Merge branch 'master' into vim51_win8	2013-03-04 17:32:52 -08:00