Merged revisions 325545 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r325545 | mnicholson | 2011-06-29 11:18:39 -0500 (Wed, 29 Jun 2011) | 2 lines
  
  make framehooks prevent native bridging (for real this time)
........


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