Merge 0.9->trunk

diff --cc net/dns.lua
index bd42db73800c13f262034159b0b1657d8b77a205,cdd949a22309fe2be2be70f64eee6e9ae3dc8622..95f09cc995d48d78db87c175ec5bf9937f0661af
--- 1/net/dns.lua
--- 2/net/dns.lua
+++ b/net/dns.lua
@@@ -623,12 -621,8 +623,13 @@@ function resolver:getsocket(servernum
        if sock then return sock; end
  
        local err;
 -      sock, err = socket.udp();
 +      local peer = self.server[servernum];
 +      if peer:find(":") then
 +              sock, err = socket.udp6();
 +      else
 +              sock, err = socket.udp();
 +      end
+       if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end
        if not sock then
                return nil, err;
        end