build err
Merge branch 'release-4.6-updates' of github.com:dhubler/sipxecs into release-4.6-updates

Conflicts:
	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/speeddial/SpeedDialManagerImpl.java