From: Kalervo Kujala <kkujala@>
Date: Thu, 25 Aug 2011 17:14:04 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9343df134df4c29ad7dd2d46894947ff5d8e320a;p=pdf.js.git

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

9343df134df4c29ad7dd2d46894947ff5d8e320a