Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Wed, 23 Jan 2013 15:19:16 +0000 (16:19 +0100)
committerAndy Wingo <wingo@pobox.com>
Wed, 23 Jan 2013 15:19:16 +0000 (16:19 +0100)

Trivial merge