Merge commit 'jamie/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 17 Sep 2008 00:42:49 +0000 (17:42 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Wed, 17 Sep 2008 00:42:49 +0000 (17:42 -0700)

Trivial merge