tree fb65f791445bc8576b664e1b6edecf9b2133e1bf
parent 3791e1537a5eddd1c6e0e00cdbda426d64582f84
parent 3946436872698531e1ebdb83642349837248e9b6
author Dave Orme <djo@coconut-palm-software.com> 1307374452 -0500
committer Dave Orme <djo@coconut-palm-software.com> 1307374452 -0500

Merge branch 'master' of ssh://git.eclipse.org/gitroot/e4/org.eclipse.e4.utils

Conflicts:
	.gitignore