Merged revisions 279598 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279598 | ghenry | 2010-07-26 21:58:12 +0100 (Mon, 26 Jul 2010) | 21 lines

  Merged revisions 279597 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/1.6.2

  -----------------------------------------------------------------------
  r279597 | ghenry | 2010-07-26 15:25:53 -0500 (Mon, 26 Jul 2010) | 13 lines

  Apply all patches in:

  https://issues.asterisk.org/view.php?id=13573 [^]

  (closes issue 0013573)
  Reported by: navkumar
  Patches:
        res_config_ldap-category.diff uploaded by navkumar (license 580)
        res_config_ldap.patch uploaded by bencer (license 961)
        res_config_ldap uploaded by bencer (license 961)
  Tested by: suretec

  ------------------------------------------------------------------------
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279600 65c4cc65-6c06-0410-ace0-fbb531ad65f3