updates from angler

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index c421fec..2df1590 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2876,7 +2876,7 @@ static int zt_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
 #ifdef PRI_2BCT
                q931c0 = p0->call;
                q931c1 = p1->call;
-               if (p0->tranfer && p1->transfer 
+               if (p0->transfer && p1->transfer 
                                && q931c0 && q931c1 
                                && !triedtopribridge) {
 

diff --git a/contrib/scripts/autosupport b/contrib/scripts/autosupport
index 5cf932d..fa3b596 100755 (executable)
--- a/contrib/scripts/autosupport
+++ b/contrib/scripts/autosupport
@@ -32,7 +32,7 @@ if [ "$ans" = "y" ]; then
   echo "------------------" >> $OUTPUT;
   echo "PCI LIST " >> $OUTPUT;
   echo "------------------" >> $OUTPUT;
-  lspci -v >> $OUTPUT;
+  lspci -vb >> $OUTPUT;
   echo >> $OUTPUT;
   echo >> $OUTPUT;