Merge commit 'Dieterbe/experimental' into experimental

author Tom Adams <tom@holizz.com>

Tue, 9 Jun 2009 11:19:17 +0000 (12:19 +0100)

committer Tom Adams <tom@holizz.com>

Tue, 9 Jun 2009 11:19:17 +0000 (12:19 +0100)
author Tom Adams <tom@holizz.com>
Tue, 9 Jun 2009 11:19:17 +0000 (12:19 +0100)
committer Tom Adams <tom@holizz.com>
Tue, 9 Jun 2009 11:19:17 +0000 (12:19 +0100)
diff --cc uzbl.c
Simple merge
diff --cc uzbl.h
Simple merge
author	Tom Adams <tom@holizz.com>
	Tue, 9 Jun 2009 11:19:17 +0000 (12:19 +0100)
committer	Tom Adams <tom@holizz.com>
	Tue, 9 Jun 2009 11:19:17 +0000 (12:19 +0100)
		1	2
uzbl.c	patch \|	diff1 \|	diff2 \|	blob \| history
uzbl.h	patch \|	diff1 \|	diff2 \|	blob \| history