Merged revisions 304985 via svnmerge from

Merged revisions 304985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304985 | tilghman | 2011-01-31 01:27:13 -0600 (Mon, 31 Jan 2011) | 16 lines

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

  ................
    r304978 | tilghman | 2011-01-31 01:25:14 -0600 (Mon, 31 Jan 2011) | 9 lines

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

    ........
      r304952 | tilghman | 2011-01-31 00:54:45 -0600 (Mon, 31 Jan 2011) | 2 lines

      Fix compilation when ODBC_STORAGE is defined.
    ........
  ................
................

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