Blocked revisions 204170 via svnmerge

........
  r204170 | tilghman | 2009-06-29 14:36:01 -0500 (Mon, 29 Jun 2009) | 3 lines
  
  Revision 189537 was supposed to make 1.4 more correct.  Instead, it broke func_odbc.  Reverting.
  (closes issue #15317, issue #14614)
........


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