Merge branch 'master' into next

author Michael Stapelberg <michael@stapelberg.de>

Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)

committer Michael Stapelberg <michael@stapelberg.de>

Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)
author Michael Stapelberg <michael@stapelberg.de>
Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)
committer Michael Stapelberg <michael@stapelberg.de>
Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)
diff --cc include/data.h
Simple merge
diff --cc src/x.c
Simple merge
author	Michael Stapelberg <michael@stapelberg.de>
	Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)
committer	Michael Stapelberg <michael@stapelberg.de>
	Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)
		1	2
include/data.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/x.c	patch \|	diff1 \|	diff2 \|	blob \| history