Merge pull request #1198 from dbbert/patch-1
authorJonathan L Long <jonlong@cs.berkeley.edu>
Thu, 2 Oct 2014 18:52:48 +0000 (11:52 -0700)
committerJonathan L Long <jonlong@cs.berkeley.edu>
Thu, 2 Oct 2014 18:52:48 +0000 (11:52 -0700)

Trivial merge