Changes to emacs-23 branch and the trunk

[Kenichi Handa]

I'm going to fix the display-table related problem in
emacs-23 branch.  But, the diff of the change will conflict
with the trunk code.  As I'm afraid that it's not a simple
work to resolve that confliction, I want to apply the same
change to the trunk code by myself.  Can I do that?  What
should I take care other than the usual committing of
changes?

---
Kenichi Handa
address@hidden