Merge branch 'upstream' into upstream-dfsg

Conflicts:
	tests/pyatspi/accessibletest.py
	tests/pyatspi/actiontest.py
	tests/pyatspi/componenttest.py
	tests/pyatspi/desktoptest.py
	tests/pyatspi/pasytest/Pasy.py
	tests/pyatspi/relationtest.py
	tests/pyatspi/statetest.py
	tests/pyatspi/testrunner
	tests/pyatspi/testrunner.in