Update usermanager to not crash, etc.

First bit of work

Merge backout

Backed out changeset 8bd3857a75ee

Merge 0.7->trunk

s2smanager: Remove potentially misleading log message (thanks albert)

Merge 0.7->trunk

(0) -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 tip

mercurial