Merged revisions 168481 via svnmerge from

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

................
r168481 | russell | 2009-01-12 08:57:49 -0600 (Mon, 12 Jan 2009) | 10 lines

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

........
r168480 | russell | 2009-01-12 08:57:27 -0600 (Mon, 12 Jan 2009) | 2 lines

s/ringdance/ringcadence/ for Bulgaria

........

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

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