tree c8e617f3ba4385ab6baf92fefbb49bbb6c1769ab
parent df4687735ba94c60801bff6f93d850d9d75ffa67
parent c1bc6a09e708984664bf0810269feea3de27bb8c
author Glyn Normington <gnormington@vmware.com> 1332513412 +0000
committer Glyn Normington <gnormington@vmware.com> 1332513412 +0000

Merge branch 'master' into 317943-replace-spring-dm-with-gemini-blueprint

Conflicts:
	org.eclipse.virgo.nano.services/.classpath