Merged revisions 283230 via svnmerge from

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

........
  r283230 | russell | 2010-08-23 08:23:12 -0500 (Mon, 23 Aug 2010) | 7 lines

  Make the AST_CEL_AMA enum match up with the AST_CDR_ ama flag values.

  Really, having 2 enums for this is silly and error prone, demonstrated by
  the crash that I hit because there was an assumption in the code that the
  values in each matched up.  However, this is a quick fix to get them to
  match up so it will work.
........

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