Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Thu, 4 Sep 2008 00:12:24 +0000 (17:12 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Thu, 4 Sep 2008 00:12:24 +0000 (17:12 -0700)

Trivial merge