Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 19 Aug 2008 21:20:24 +0000 (14:20 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 19 Aug 2008 21:20:24 +0000 (14:20 -0700)

Trivial merge