Updated Debian package (nginx 1.2.6-1)
Merge branch 'upstream'

Conflicts:
	debian/control