Merge branch 'stable'

author Lars Hjemli <hjemli@gmail.com>

Tue, 3 Aug 2010 20:52:11 +0000 (22:52 +0200)

committer Lars Hjemli <hjemli@gmail.com>

Tue, 3 Aug 2010 20:52:11 +0000 (22:52 +0200)
author Lars Hjemli <hjemli@gmail.com>
Tue, 3 Aug 2010 20:52:11 +0000 (22:52 +0200)
committer Lars Hjemli <hjemli@gmail.com>
Tue, 3 Aug 2010 20:52:11 +0000 (22:52 +0200)
diff --cc Makefile
Simple merge
diff --cc ui-refs.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Tue, 3 Aug 2010 20:52:11 +0000 (22:52 +0200)
committer	Lars Hjemli <hjemli@gmail.com>
	Tue, 3 Aug 2010 20:52:11 +0000 (22:52 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
ui-refs.c	patch \|	diff1 \|	diff2 \|	blob \| history