push this after rebase
Merge commit 'cee315d831f036aefb9255d924479f3d8ac2c593'

Conflicts:
	eclipse_egit_test/src/Test.java