Alena Prokharchyk b61468d65c Merge branch 'master' into vpc
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
..
2012-08-11 11:40:03 -07:00
2012-07-16 15:43:58 -04:00
2012-08-11 12:01:02 -07:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00
2012-07-16 15:43:58 -04:00