Allow noop-adding of None objects.
Merge branch 'master' into python3
Reimplemented the SP output formatters to hopefully work better and faster.
Merge branch 'master' into python3

Conflicts:
	wrw/sp/util.py
	wrw/sp/xhtml.py
Merge branch 'python3' of git.dolda2000.com:/srv/git/r/wrw into python3
Improved indentation a bit.
Merge branch 'master' into python3

Conflicts:
	wrw/sp/util.py
Improved indentation a bit further.
Merge branch 'master' into python3

Conflicts:
	wrw/sp/util.py