Merged revisions 371394,371398 via svnmerge from

Merged revisions 371394,371398 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r371394 | kmoore | 2012-08-16 17:42:53 -0500 (Thu, 16 Aug 2012) | 11 lines

  Add module reload instrumentation for TEST_FRAMEWORK

  This adds AMI events for module reloads when Asterisk is built with
  TEST_FRAMEWORK enabled and corrects generation of the module load AMI
  event.

  (issue PQ-1126)
  ........

  Merged revisions 371393 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r371398 | twilson | 2012-08-16 17:50:12 -0500 (Thu, 16 Aug 2012) | 13 lines

  Handle integer over/under-flow in ast_parse_args

  The strtol family of functions will return *_MIN/*_MAX on overflow. To
  detect when an overflow has happened, errno must be set to 0 before
  calling the function, then checked afterward.

  (closes issue ASTERISK-20120)
  Reported by: Matt Jordan
  Review: https://reviewboard.asterisk.org/r/2073/
  ........

  Merged revisions 371392 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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