Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 16 Aug 2008 17:08:24 +0000 (10:08 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 16 Aug 2008 17:08:24 +0000 (10:08 -0700)

Trivial merge