# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1302903906 -3600
# Node ID 210639fb8fbee1d28194466b5912fd76f0528d82
# Parent  7b456af75c77a636809dc368f7319df12836f1c6# Parent  96e9d5f9ab3b5cfad2ddf0a752e2af2cce2be330
Merge Zash->trunk

diff -r 7b456af75c77 -r 210639fb8fbe net/dns.lua
--- a/net/dns.lua	Fri Apr 15 22:39:53 2011 +0100
+++ b/net/dns.lua	Fri Apr 15 22:45:06 2011 +0100
@@ -479,7 +479,7 @@
 end
 
 function resolver:TXT(rr)    -- - - - - - - - - - - - - - - - - - - - - -  TXT
-	rr.txt = self:sub (rr.rdlength);
+	rr.txt = self:sub (self:byte());
 end