Merge branch 'master' into next

author Michael Stapelberg <michael@stapelberg.de>

Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)

committer Michael Stapelberg <michael@stapelberg.de>

Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)
author Michael Stapelberg <michael@stapelberg.de>
Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)
committer Michael Stapelberg <michael@stapelberg.de>
Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)
diff --cc src/cfgparse.y
Simple merge
diff --cc src/ipc.c
Simple merge
author	Michael Stapelberg <michael@stapelberg.de>
	Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)
committer	Michael Stapelberg <michael@stapelberg.de>
	Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)
		1	2
src/cfgparse.y	patch \|	diff1 \|	diff2 \|	blob \| history
src/ipc.c	patch \|	diff1 \|	diff2 \|	blob \| history