Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 14 Jun 2008 19:58:57 +0000 (15:58 -0400)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 14 Jun 2008 19:58:57 +0000 (15:58 -0400)

Trivial merge