Merged revisions 167442 via svnmerge from

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

................
r167442 | russell | 2009-01-07 11:35:39 -0600 (Wed, 07 Jan 2009) | 12 lines

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

........
r167432 | russell | 2009-01-07 11:29:53 -0600 (Wed, 07 Jan 2009) | 4 lines

Treat an empty string the same way as a NULL country argument.

In passing, simplify the handling of returning a default tone zone.

........

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

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