easier to use within a module, e.g. in the scheduler
improved es.py, thanks mcamel and Vladyslav
fixed line not found issues in set breakpoint (linecache patch, used by the debugger)
update pbkdf2_ctypes.py to upstream
added support for python2.5
still support for python2.5
fixed problem with ENABLED/DISABLED, issue 1689
no more if len(dpost)
Merge pull request #224 from niphlod/enhancement/sessions2trash.py

session2trash.py: easier to use within a module, e.g. in the scheduler
Merge pull request #225 from reingart/master

fixed line not found issues in set breakpoint (linecache patch, used by the debugger)
syncing
Merge branch 'master' of github.com:web2py/web2py
fixed line not found issues in set breakpoint, thanks Mariano
Merge pull request #226 from michele-comitini/master

update pbkdf2_ctypes.py to upstream
update pbkdf2_ctypes.py to upstream, thanks Michele