Sheng Yang 5cb9df91a1 Merge branch 'ipv6' ... Conflicts: api/src/com/cloud/network/NetworkProfile.java		2013-01-31 15:07:33 -08:00
..
src/com/cloud	Merge branch 'ipv6'	2013-01-31 15:07:33 -08:00
pom.xml	Core should not depend on xapi, only the xen and ovm plugin.	2012-10-02 10:19:15 -07:00