Merge branch 'python24'
authorNeil Moore <neil.moore@csurs.csr.uky.edu>
Fri, 6 Jun 2008 18:22:29 +0000 (14:22 -0400)
committerNeil Moore <neil.moore@csurs.csr.uky.edu>
Fri, 6 Jun 2008 18:22:29 +0000 (14:22 -0400)
Conflicts:
loc.py


Trivial merge