tree 81a216d152197c732f2a876b9790c43310a6c1af
parent d02ff68867a61c4a0ebac51f537570719fa16a3e
parent fa78301161aa917c0ef8e34f2df1afc0f687d0c0
author adamb <adamb@apache.org> 1362770990 -0600
committer adamb <adamb@apache.org> 1362770990 -0600

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-hdt

Conflicts:
	org.apache.hdt.help/.classpath
	org.apache.hdt.ui/.classpath