[MERGE] Minor cleanup

[John Arbash Meinel]

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

Seeing the earlier patch about format_version_tuple, I went ahead and
cleaned up the variable names. They had __* because it used to be done
at module scope. Since it is in a function now, there is no reason not
to use regular variables.

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

iEYEARECAAYFAkksMAkACgkQJdeBCYSNAAOgpwCfYvuwrWIzKweUGJLHH/PfeO0S
RRwAnjogzidGOFzGnJkMkFwC6+QmlB+R
=Xpms
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: var_cleanup.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20081125/db53e640/attachment-0001.diff