Merge branch 'master' into next

author Michael Stapelberg <michael@stapelberg.de>

Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)

committer Michael Stapelberg <michael@stapelberg.de>

Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)
author Michael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)
committer Michael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)
diff --cc src/con.c
Simple merge
diff --cc src/randr.c
Simple merge
author	Michael Stapelberg <michael@stapelberg.de>
	Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)
committer	Michael Stapelberg <michael@stapelberg.de>
	Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)
		1	2
src/con.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/randr.c	patch \|	diff1 \|	diff2 \|	blob \| history