Sync of SR with public. 


git-svn-id: http://wush.net/svn/range/software/public/subscriberRegistry/trunk@6166 19bc5d8c-e614-43d4-8b26-e1612bc8e597