updated to v2.2 from http://plugins.svn.wordpress.org/jetpack/tags/2.2
Merge branch '2.2'