Merge remote-tracking branch 'gperciva/master' into python-2.6

Conflicts:
	gub/specs/python.py
	lilypond.make