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

Trivial merge