Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Sun, 12 Feb 2012 12:32:56 +0000 (13:32 +0100)
committerAndy Wingo <wingo@pobox.com>
Sun, 12 Feb 2012 12:32:56 +0000 (13:32 +0100)

Trivial merge