Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 2 Sep 2008 22:40:02 +0000 (15:40 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Tue, 2 Sep 2008 22:40:02 +0000 (15:40 -0700)

Trivial merge