Merge commit 'a675a2e81b792b9f860bec57c38a1948631c7a41'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:31:42 +0000 (14:31 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:31:42 +0000 (14:31 +0100)

Trivial merge