shortlink for imdb added
Merge branch 'shortlinks' of github.com:lkiesow/surf into shortlinks

Conflicts:
	surf.c
Merge branch 'shortlinks' into featuremerge