Merged revisions 288265-288266 via svnmerge from

Merged revisions 288265-288266 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r288265 | tilghman | 2010-09-22 09:48:04 -0500 (Wed, 22 Sep 2010) | 9 lines

  Allow the encoding to be set, in case local charset does not agree with database.

  (closes issue #16940)
   Reported by: jamicque
   Patches:
         20100827__issue16940.diff.txt uploaded by tilghman (license 14)
         20100921__issue16940__1.6.2.diff.txt uploaded by tilghman (license 14)
   Tested by: jamicque
........
  r288266 | tilghman | 2010-09-22 10:04:52 -0500 (Wed, 22 Sep 2010) | 5 lines

  Document addition of encoding parameter.

  (issue #16940)
  Reported by: jamicque
........

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