Alex Huang 7bdddd0726 merged from master		2013-05-29 15:45:38 -07:00
..
com/cloud	merged from master	2013-05-29 15:45:38 -07:00
org/apache/cloudstack	fixing unit tests to comply with bug "CLOUDSTACK-2477: [GSLB]	2013-05-29 18:54:36 +05:30
resources	merge from master complete	2013-05-19 20:04:28 -07:00