From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Wed, 21 Mar 2012 23:13:24 +0000 (-0700)
Subject: Merge upstream.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2d7e1d634674d6d0563fdef7d7ef180eed40cd4f;p=pdf.js.git

Merge upstream.
---

2d7e1d634674d6d0563fdef7d7ef180eed40cd4f