Merge error

There was a '<<< HEAD' line
Support for IPv6
(from Ubuntu Natty)

not everbody has an acer...
Structured Google-URLs a bit
merge relict
winhelp2002 has moved
Take 'hosts.private' into account; generate first line using 'hostname'
Block Google+
\r\n -> \r. Closes #3
merge changes from jonashaag and charringer
IPv6 hostnames
blank line after hostname
Merge branch 'sebix-master'

Conflicts:
	hosts.mine
	update-hosts.sh
add hosts.private to gitignore