[merge] Find python2.5 if python2.4 isn't available

[John Arbash Meinel]

The attached patch just adds python2.5 as one of the looked-for pythons.
This handles the case where the user has a default of python2.3, but
installs python2.5 manually.

I left python2.4 as the first default checked, because I think at this
point, we are more comfortable running on 2.4. (We have done some
checking, and it does seem to work with 2.5, but AFAIK we haven't done
some thorough code auditing yet to handle some of the more recent changes)
https://launchpad.net/products/bzr/+bug/54114

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060929/1005b4fd/attachment.pgp