Merged revisions 328428-328429 via svnmerge from

Merged revisions 328428-328429 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328428 | may | 2011-07-15 23:31:09 +0400 (Fri, 15 Jul 2011) | 13 lines

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

  ........
    r328427 | may | 2011-07-15 23:22:24 +0400 (Fri, 15 Jul 2011) | 7 lines

    small gk processing fixes:
    - decrease for 1 second registration ttl for very low expirations (some
      providers expire few earlier than TTL)
    - delete rrq and registration expire timers on URQ received as we make
      new registration.
  ........
................
  r328429 | may | 2011-07-15 23:35:50 +0400 (Fri, 15 Jul 2011) | 2 lines

  delete unproperly changed svn props
................

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