Merge commit 'Dieterbe/experimental' into experimental

author uranther <jwheaton@purdue.edu>

Tue, 14 Jul 2009 19:45:37 +0000 (15:45 -0400)

committer uranther <jwheaton@purdue.edu>

Tue, 14 Jul 2009 19:45:37 +0000 (15:45 -0400)
author uranther <jwheaton@purdue.edu>
Tue, 14 Jul 2009 19:45:37 +0000 (15:45 -0400)
committer uranther <jwheaton@purdue.edu>
Tue, 14 Jul 2009 19:45:37 +0000 (15:45 -0400)
diff --cc README
Simple merge
diff --cc uzbl.c
Simple merge
author	uranther <jwheaton@purdue.edu>
	Tue, 14 Jul 2009 19:45:37 +0000 (15:45 -0400)
committer	uranther <jwheaton@purdue.edu>
	Tue, 14 Jul 2009 19:45:37 +0000 (15:45 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
uzbl.c	patch \|	diff1 \|	diff2 \|	blob \| history