Add meta file for eclipse m2e
Merge remote-tracking branch 'upstream/1.5' into 1.5

Conflicts:
	pom.xml
Merge pull request #819 from emmanuel-keller/1.5

Add meta file for eclipse m2e