From: Kalervo Kujala <kkujala@com>
Date: Thu, 5 Jan 2012 19:16:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=09eed8d9715f7ef569c3ca9b2d43f14a7d1f73f8;p=pdf.js.git

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

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

09eed8d9715f7ef569c3ca9b2d43f14a7d1f73f8