I don't have an upstream CVS account. Do you want a reindented patch, or are you okay with the existing one? -- Vino-server takes 90% of cpu when only listening for incoming connections https://launchpad.net/bugs/31037