Merge branch 'master' into mpx

Conflicts:

	src/xinput.c

(just a whitespace conflict)

diff --cc src/Makefile.am
Simple merge

diff --cc src/list.c
Simple merge

diff --cc src/xinput.c
Simple merge

diff --cc src/xinput.h
Simple merge