Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 15 Aug 2008 15:53:08 +0000 (08:53 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 15 Aug 2008 15:53:08 +0000 (08:53 -0700)

Trivial merge