Merge branch 'stable'

author Lars Hjemli <hjemli@gmail.com>

Sat, 12 Dec 2009 11:09:47 +0000 (12:09 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Sat, 12 Dec 2009 11:09:47 +0000 (12:09 +0100)
author Lars Hjemli <hjemli@gmail.com>
Sat, 12 Dec 2009 11:09:47 +0000 (12:09 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Sat, 12 Dec 2009 11:09:47 +0000 (12:09 +0100)
diff --cc Makefile
Simple merge
diff --cc ui-tree.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Sat, 12 Dec 2009 11:09:47 +0000 (12:09 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Sat, 12 Dec 2009 11:09:47 +0000 (12:09 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
ui-tree.c	patch \|	diff1 \|	diff2 \|	blob \| history