Merged the changes from branch/merge-with-vnc-4.1.1, revisions 564:565.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@567 3789f03b-4d11-0410-bbf8-ca57d06f2519
2 files changed