[MERGE] Fix out-of-date error, refactor slightly

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Hi Robert,
> 
> This patch fixes the text for the "out-of-date" error, and moves common
> functionality to _check_switch.
> 
> Aaron


Aaron, did you just commit the cardinal sin of sending a plain [MERGE]
request for a plugin?

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIELSrJdeBCYSNAAMRAhQfAKC18k2J3mC0/s2C7hq1Km/fVmXi9QCeJPvY
jRmTKVm0NZjrRJY3VLOStt0=
=rQKS
-----END PGP SIGNATURE-----