Merged from trunk

diff --cc src/acl/Acl.cc
Simple merge

diff --cc src/acl/UserData.cc
index bd1b7e0875360838d703541d3fc10196a21691e8,8d1e1fa24fc732dd375ae0021c208b6286b2bc3f..7ae43ae9c641c3bc6fbcaf427b96f15feaa3c00b
--- 1/src/acl/UserData.cc
--- 2/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@@ -44,16 -80,24 +44,17 @@@ ACLUserData::dump() cons
  {
      SBufList sl;
  
-     if (flags.case_insensitive)
-         sl.push_back(SBuf("-i"));
- 
      if (flags.required) {
          sl.push_back(SBuf("REQUIRED"));
-     } else {
-         sl.insert(sl.end(), userDataNames.begin(), userDataNames.end());
+         return sl;
      }
  
 -    /* damn this is VERY inefficient for long ACL lists... filling
 -     * a SBufList this way costs Sum(1,N) iterations. For instance
 -     * a 1000-elements list will be filled in 499500 iterations.
 -     */
 -    if (names) {
 -        UserDataAclDumpVisitor visitor;
 -        names->visit(visitor);
 -        sl.splice(sl.end(),visitor.contents);
 -    }
+     if (flags.case_insensitive)
+         sl.push_back(SBuf("-i"));
+ 
++    sl.insert(sl.end(), userDataNames.begin(), userDataNames.end());
+ 
 +    debugs(28,5, "ACLUserData dump output: " << SBufContainerJoin(userDataNames,SBuf(" ")));
      return sl;
  }