Merged revisions 168200 via svnmerge from

Merged revisions 168200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168200 | russell | 2009-01-09 16:21:05 -0600 (Fri, 09 Jan 2009) | 10 lines

Merged revisions 168198 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r168198 | russell | 2009-01-09 16:14:38 -0600 (Fri, 09 Jan 2009) | 2 lines

Make this compile for mvanbaak

........

................

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