From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 11 Jul 2011 11:49:26 +0000 (+0200)
Subject: Merge with upstream
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=068bfa0bfe29cc51df462b40902055c369beb21f;p=pdf.js.git

Merge with upstream
---

068bfa0bfe29cc51df462b40902055c369beb21f