Alex Huang 4a9cf4b4a8 Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin		2013-01-18 15:59:24 -08:00
..
kvm	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
ovm	Separate loadable components like Gurus, Elements, Adapters to componentContext.xml	2013-01-16 16:33:59 -08:00
simulator	fixed unit tests from merge	2013-01-18 15:58:55 -08:00
vmware	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
xen	Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin	2013-01-18 15:59:24 -08:00