Log Message:
This conflicts with tightvncviewer. And bump revision.
(The other conflict in tightvncviewer was already there.)

(Also while here fixes some indenting.)