Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 2 Sep 2008 23:39:47 +0000 (16:39 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 2 Sep 2008 23:39:47 +0000 (16:39 -0700)

Trivial merge