From: Kalervo Kujala <kkujala@com>
Date: Tue, 10 Jan 2012 17:27:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0c50d14f387d08a4115f8cfabc50e4738a8ef369;p=pdf.js.git

Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	test/unit/unit_test.html
---

0c50d14f387d08a4115f8cfabc50e4738a8ef369