* add image_filter watermark patch
add nginx-1.2.9
Merge branch 'master' of https://github.com/liut/gentoo-portage

Conflicts:
	www-servers/nginx/Manifest