XHTML table import: support for adjacent vertically merged cells...

...and cells merged both vertically and horizontally