Accidentally put this stuff in a tag, needs to be in branches.


git-svn-id: https://svn.resiprocate.org/rep/resiprocate/branches/resiprocate-1.4@8286 ddefafc4-47db-0310-ae44-fa13212b10f2