-first cut at merge from older b-uasprack-20091103

git-svn-id: https://svn.resiprocate.org/rep/resiprocate/branches/b-uasprack-20130904@10476 ddefafc4-47db-0310-ae44-fa13212b10f2
-quick fix compiler issue with Log.cxx - proper fix is on trunk

git-svn-id: https://svn.resiprocate.org/rep/resiprocate/branches/b-uasprack-20130904@10477 ddefafc4-47db-0310-ae44-fa13212b10f2