Comment 5 for bug 829630

Thanks all.

Steven, this is the second commit of yours I've merged recently. I'm glad to see a bigger set of names in the commit log. Going forward, remember to sign-off your own commits, and also, why not get a Launchpad account and comment here directly?

I have merged this to master, rel_2_2 and rel_2_1.