Merged revisions 205412 via svnmerge from

Merged revisions 205412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r205412 | dvossel | 2009-07-08 17:15:06 -0500 (Wed, 08 Jul 2009) | 12 lines

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

  ........
    r205409 | dvossel | 2009-07-08 16:35:12 -0500 (Wed, 08 Jul 2009) | 6 lines

    moving ast_devstate_to_extenstate to pbx.c from devicestate.c

    ast_devstate_to_extenstate belongs in pbx.c.  This change
    fixes a compile time error with chan_vpb as well.
  ........
................

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