Merged revisions 228080 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r228080 | qwell | 2009-11-05 13:16:29 -0600 (Thu, 05 Nov 2009) | 15 lines
  
  Merged revisions 228079 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r228079 | qwell | 2009-11-05 13:14:25 -0600 (Thu, 05 Nov 2009) | 8 lines
    
    Fix crash on VPB exception when no hardware is present.
    
    (closes issue #14970)
    Reported by: tzafrir
    Patches:
          vpb_exception.diff uploaded by tzafrir (license 46)
    Tested by: markwaters
  ........
................


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

channels/chan_vpb.cc

@@ -2702,7 +2702,7 @@ static enum ast_module_load_result load_module()
 	int num_cards = 0;
 	try {
 		num_cards = vpb_get_num_cards();
-	} catch (VpbException e) {
+	} catch (std::exception e) {
 		ast_log(LOG_ERROR, "No Voicetronix cards detected\n");
 		return AST_MODULE_LOAD_DECLINE;
 	}