Fix a formatting error in utility.c introduced by merge
Fix a merge error in tablecmds.c
Remove a FIXME with appropriate comments in dbcommands.c
Conflict resolution patch for doc-xc.
Additional commit for doc-xc conflict resolution: stylesheet and
tools.