Merge branch 'master' of https://github.com/gforge/Gmisc

Conflicts:
	R/htmlTable.R
	man/htmlTable.Rd
Merge branch 'master' of https://github.com/gforge/Gmisc

Conflicts:
	man/htmlTable.Rd