Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 22 Aug 2008 07:36:06 +0000 (00:36 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 22 Aug 2008 07:36:06 +0000 (00:36 -0700)

Trivial merge