Comment 10 for bug 333013

I actually ported the fix over to 1.6 yesterday. It still needs some testing though, and I need to decide if it should bet possible to use /etc/resolv.conf directly if resolvconf is installed.