Merge branch 'robhelmut' of http://gnarfk.homelinux.org/~helmut/uzbl