tree 7da1983f675cd964a0040360979b1f4ea2a0a639
parent 2cf9440e848de4d23f0513536d6affee472a8a0d
parent ad5340170d3264aa1c67dd633942bced70008ca0
author Doug Clarke <douglas.clarke@oracle.com> 1367569884 -0400
committer Doug Clarke <douglas.clarke@oracle.com> 1367569884 -0400

Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/examples

Conflicts:
	dbws/dbws.simple/src/main/resources/dbws-builder.xml