From d50d40f7fcf40b6918639018f9c8ae820773f08b Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Sat, 9 Aug 2008 12:54:30 +0000
Subject: [PATCH] Blocked revisions 136888 via svnmerge

........
r136888 | seanbright | 2008-08-09 08:53:57 -0400 (Sat, 09 Aug 2008) | 4 lines

Merge more changes from the resolve-shadow-warnings branch (henceforth known
as RSW since i am too lazy to keep typing it all out).  This time a few of
the channels.

........


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