Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 11 Oct 2008 21:19:50 +0000 (17:19 -0400)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 11 Oct 2008 21:19:50 +0000 (17:19 -0400)

Trivial merge