Merge branch 'hacking'
authorDavid Schleef <ds@schleef.org>
Wed, 2 Jun 2010 18:31:26 +0000 (11:31 -0700)
committerDavid Schleef <ds@schleef.org>
Wed, 2 Jun 2010 18:31:26 +0000 (11:31 -0700)

Trivial merge