fix issue 1592
fixed a problem in recent commit when pycrypto is missing, the fix is temporary
Merge pull request #138 from niphlod/issue/1592

fix issue 1592
Merge branch 'master' of github.com:web2py/web2py
removed pycrypto leaving only strxor for speeding up pbkdf2
files toggle in admin, maybe as Massimo would want it
fixed conflict
Merge pull request #140 from carpaIdea/master

files toggle in admin, maybe as Massimo would want it
Merge ssh://github.com/web2py/web2py