Merge remote-tracking branch 'origin/master'
authorAndy Wingo <wingo@pobox.com>
Mon, 21 May 2012 17:20:55 +0000 (19:20 +0200)
committerAndy Wingo <wingo@pobox.com>
Mon, 21 May 2012 17:20:55 +0000 (19:20 +0200)

Trivial merge