Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Mon, 4 Aug 2008 16:28:38 +0000 (09:28 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Mon, 4 Aug 2008 16:28:38 +0000 (09:28 -0700)

Trivial merge