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

Trivial merge