svn path=/trunk/; revision=4868
dictionary as an XML file rather than building it in, and various Diameter updates. svn path=/trunk/; revision=4122