Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Wed, 15 Feb 2012 10:43:32 +0000 (11:43 +0100)
committerAndy Wingo <wingo@pobox.com>
Wed, 15 Feb 2012 10:43:32 +0000 (11:43 +0100)

Trivial merge