Merge commit 'mlcastle/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 19 Aug 2008 05:27:19 +0000 (22:27 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 19 Aug 2008 05:27:19 +0000 (22:27 -0700)

Trivial merge