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

[Aaron Bentley]

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

Hi Robert,

This patch fixes the text for the "out-of-date" error, and moves common
functionality to _check_switch.

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

iD8DBQFIELPT0F+nu1YWqI0RAo72AJoCUB83hWQNhI+Ts6hbWlVSIpytCQCeMC5U
fg1DUIAfOI03V99er+A6+ek=
=ttNT
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: loom-82.patch
Type: text/x-diff
Size: 3700 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080424/37eaba89/attachment-0002.bin