Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 29 Oct 2008 05:40:21 +0000 (01:40 -0400)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 29 Oct 2008 05:40:21 +0000 (01:40 -0400)

Trivial merge