Merge remote-tracking branch 'origin/stable-2.0' into stable-2.0
authorAndy Wingo <wingo@pobox.com>
Thu, 10 May 2012 13:55:25 +0000 (15:55 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 10 May 2012 13:55:25 +0000 (15:55 +0200)

Trivial merge