stupidy merge - surf - Simple Web browser based on WebKit/GTK+

commit 7822a6e829638c83bc8743b593144145cb531f5c
parent 839edbe22dbe789f56fb4383b5f348f0846d0a58
Author: Enno Boland (tox) <tox@s01.de>
Date:   Sun,  6 Sep 2009 14:13:17 +0200

stupidy merge

	surf Simple Web browser based on WebKit/GTK+
	git clone git://git.janpasierb.com/surf.git
	Log \| Files \| Refs \| README \| LICENSE