Merged from trunk

author Amos Jeffries <squid3@treenet.co.nz>

Fri, 23 Nov 2012 12:53:57 +0000 (01:53 +1300)

committer Amos Jeffries <squid3@treenet.co.nz>

Fri, 23 Nov 2012 12:53:57 +0000 (01:53 +1300)
author Amos Jeffries <squid3@treenet.co.nz>
Fri, 23 Nov 2012 12:53:57 +0000 (01:53 +1300)
committer Amos Jeffries <squid3@treenet.co.nz>
Fri, 23 Nov 2012 12:53:57 +0000 (01:53 +1300)
diff --cc helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
Simple merge
author	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 23 Nov 2012 12:53:57 +0000 (01:53 +1300)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 23 Nov 2012 12:53:57 +0000 (01:53 +1300)