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

Trivial merge