Merge proposals dependent on lp://staging/~maxb/ubuntu/lucid/python-defaults/py2.7

1. Lucid (10.04)
2. py2.7
3. Dependent merge proposals