tree 1f3c491d06cfd796b901f5e4356de1ea11b619e7
parent 443a9b62c87e5d3506a768bef6345b8ab5f46565
parent 4fb6d8fea1a8fa00d37c3b46dd6ef4ec5f31ace3
author Christopher Frost <frostc@vmware.com> 1325692245 +0000
committer Christopher Frost <frostc@vmware.com> 1325692245 +0000

Merge branch 'master' of ssh://git.eclipse.org/gitroot/gemini.management/org.eclipse.gemini.managment

Conflicts:
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/BundleStateTest.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/BundleStateTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/BundleWiringStateTest.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/BundleWiringStateTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/FrameworkTest.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/FrameworkTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/PackageStateTest.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/framework/PackageStateTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleStateTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/BundleWiringStateTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/FrameworkTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/PackageStateTests.java
	org.eclipse.gemini.mgmt.tests/src/org/eclipse/gemini/mgmt/integration/tests/ServiceStateTests.java