testting EGit winXP
test 2
and
Merge remote-tracking branch 'origin/master'