Recorded merge of revisions 372373 from http://svn.asterisk.org/svn/asterisk/branches/11
authorRichard Mudgett <rmudgett@digium.com>
Wed, 5 Sep 2012 19:44:32 +0000 (19:44 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 5 Sep 2012 19:44:32 +0000 (19:44 +0000)
commit84849cf413e83cda3ee9cb4ff3ed6e9993723acf
treef97f3e8a7145db9933162e63dd8a829532f18176
parentedb290ca095cf27b202e74615d4a90e9b59bc419
Recorded merge of revisions 372373 from svn.asterisk.org/svn/asterisk/branches/11

........
Fix compile error.
........

Merged revisions 372372 from http://svn.asterisk.org/svn/asterisk/branches/10

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