Merge commit 'e7bd20f7d9b2110fdc0fa25db5a2bfe6b2214923'
authorAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:15:55 +0000 (16:15 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:15:55 +0000 (16:15 +0100)

Trivial merge