Merge branch 'master' into dprotect

Conflicts:
	pdns/dnsname.cc
	pdns/dnsname.hh

diff --cc pdns/dnsname.cc
index b039de17948644a8ae6deb3c090af7ae3154253b,7f7976e91e0d5044b3cee03a9a23dd2d52ad6e26..41e12723059f867d3127bd5ed73e64459d988558
--- 1/pdns/dnsname.cc
--- 2/pdns/dnsname.cc
+++ b/pdns/dnsname.cc
@@@ -152,6 -158,8 +158,10 @@@ void DNSName::makeUsRelative(const DNSN
  DNSName DNSName::labelReverse() const
  {
    DNSName ret;
++
+   if(isRoot())
+     return *this; // we don't create the root automatically below
++
    if (!empty()) {
      vector<string> l=getRawLabels();
      while(!l.empty()) {