Merged revisions 1039-1043 via svnmerge from
authorerickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Tue, 17 Jul 2007 14:50:56 +0000 (14:50 +0000)
committererickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Tue, 17 Jul 2007 14:50:56 +0000 (14:50 +0000)
commit7c5d6d5e07a1699c96957c6049fb5427181965a2
treea9f509cfe7c4aff0affa19980bb72b575504e417
parent189870cb9b897a4efc4a65a5fa0038d5c1c7138f
Merged revisions 1039-1043 via svnmerge from
svn://svn.open-ils.org/OpenSRF/trunk

........
  r1041 | erickson | 2007-07-17 10:07:43 -0400 (Tue, 17 Jul 2007) | 1 line

  added config contexts for config files.  fixed some osrfNetworkObject handling bugs.  did some re-tabbing to change to space-based tabs
........

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/new-json2@1044 9efc2488-bf62-4759-914b-345cdb29e865
src/python/osrf/conf.py
src/python/osrf/log.py
src/python/osrf/net_obj.py
src/python/osrf/ses.py
src/python/osrf/system.py
src/python/osrf/utils.py
src/python/srfsh.py