tree 367a567237fc93c6828de041fcb1fac62c6d6a6a
parent 4bc1baa41be775f58bda00652beb268fb0e2d1be
parent 24e79e569b1b337a09d9e3c69284ee088df80780
author Tom Ware <tom.ware@oracle.com> 1331138308 -0500
committer Tom Ware <tom.ware@oracle.com> 1331138308 -0500

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

Conflicts:
	JPA-RS/org.eclipse.persistence.jpars/.classpath