Merge commit 'e6c1c5f6cb16913eadeb8758cd817c5a58d146b8'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:06:26 +0000 (15:06 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:06:26 +0000 (15:06 +0100)

Trivial merge