upgrade setuptools to version 2.0
Merge branch 'master' into setuptools2

Conflicts:
	build/pkgs/setuptools/checksums.ini
upgrade to setuptools 2.0.1
new hash for cores
#15656: Sending groups to Gap renumbers permutation groups
#15656: Fix spacing in doctest output
Fixed file extension checking saving for plot3d, to insure excess files aren't created
implemented proper equality testing
define an inverse (Shannon) entropy function

* To make sure the output of the inverse is unique we only return values
  less than 1-1/q

* The function is not imported into the global namespace

* The entropy function defaults to the binary entropy now
Move PARI databases out of PARI package
Merge remote-tracking branch 'origin/develop' into ticket/15765

Conflicts:
	build/pkgs/pari/SPKG.txt
Merge remote-tracking branch 'origin/u/stumpc5/ticket/15533' into public/combinat/cores/15533
fixed comparison in strong tableaux code for empty core
setuptools: export PYTHON_EGG_CACHE and silence a warning about it
Trac #15728: rebase to 6.2.beta0
Updated Sage version to 6.2.beta1
Trac #15510: upgrade setuptools to version 2.0.1

Source Tarball: [[https://pypi.python.org/packages/source/s/setuptools/s
etuptools-2.0.1.tar.gz|setuptools-2.0.1.tar.gz]]

URL: http://trac.sagemath.org/15510
Reported by: ohanar
Ticket author(s): R. Andrew Ohana
Reviewer(s): John Palmieri
Trac #15533: Making the hash of cores depend on the parameter

Currently, a core does not hash its parameter, so having a dict with the
two keys
{{{
sage: A = Core([2],4)
sage: B = Core([2],5)
sage: hash(A) == hash(B)
True
}}}
fails to work.

URL: http://trac.sagemath.org/15533
Reported by: stumpc5
Ticket author(s): Christian Stump
Reviewer(s): Anne Schilling
Trac #15765: Move PARI databases out of PARI package

The PARI package in Sage contains two databases (`galdata` and `seadata-
small`). These should be separated and the packaging simplified.

'''Upstream''' (all these are simply repacked/renamed upstream
tarballs):
 - [http://boxen.math.washington.edu/home/jdemeyer/spkg/pari-2.5.5b.tar.
bz2]
 - [http://boxen.math.washington.edu/home/jdemeyer/spkg/pari_galdata-200
80411.tar.bz2]
 - [http://boxen.math.washington.edu/home/jdemeyer/spkg/pari_seadata_sma
ll-20090618.tar.bz2]

URL: http://trac.sagemath.org/15765
Reported by: jdemeyer
Ticket author(s): Jeroen Demeyer
Reviewer(s): Peter Bruin
Trac #15656: Sending groups to Gap renumbers permutation groups

Groups created from graph automorphisms start numbering at zero, but Gap
doesn't, so we get nasty behavior like this:
{{{
sage:
G1=Graph(':H`ECw@HGXGAGUG`e');G=G1.automorphism_group();sg=G.subgroups()
sage: G
Permutation Group with generators [(0,7)(1,4)(2,3)(6,8)]
sage: [s for s in sg]
[Permutation Group with generators [()],
 Permutation Group with generators [(1,8)(2,5)(3,4)(7,9)]]
}}}

This originated at [https://groups.google.com/forum/#!topic/sage-
support/Lvft5VA7rFg this sage-support thread].
The root of the problem is
{{{
sage: G._gap_()
Group( [ (1,8)(2,5)(3,4)(7,9) ] )
}}}

URL: http://trac.sagemath.org/15656
Reported by: kcrisman
Ticket author(s): Mike Hansen
Reviewer(s): Nathann Cohen