Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 3 Sep 2008 20:59:59 +0000 (13:59 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 3 Sep 2008 20:59:59 +0000 (13:59 -0700)

Trivial merge