pyorbit: new changes from Debian require merging

New changes from Debian require merging into Ubuntu.

Some, if not all, of this work has been done automatically;
however the changes should be reviewed before signing and
uploading.

The new source package, along with various patches to aid
your review are available at:

        http://people.ubuntu.com/~scott/ongoing-merge/pyorbit/

In particular see the REPORT file for details.

If this is the first time you have received one of these
bugs, or are just unsure what to do, see:

        http://people.ubuntu.com/~scott/ongoing-merge/README

 -- Your friendly neighbourhood Merge-O-Matic.