Merge branch 'master' of git://github.com/mozilla/pdf.js.git into issue-863

Conflicts:
	test/pdfs/.gitignore

test/pdfs/.gitignore

@@ -18,3 +18,4 @@
 !cmykjpeg.pdf
 !issue840.pdf
 !scan-bad.pdf
+!freeculture.pdf

test/pdfs/bpl13210.pdf.link

@@ -0,0 +1 @@
+http://h20000.www2.hp.com/bc/docs/support/SupportManual/bpl13210/bpl13210.pdf

test/test_manifest.json

@@ -87,6 +87,13 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "freeculture",
+       "file": "pdfs/freeculture.pdf",
+       "md5": "dcdf3a8268e6a18938a42d5149efcfca",
+       "rounds": 1,
+       "pageLimit": 5,
+       "type": "eq"
+    },
     {  "id": "wnv_chinese-pdf",
        "file": "pdfs/wnv_chinese.pdf",
        "md5": "db682638e68391125e8982d3c984841e",
@@ -302,6 +309,14 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "bpl13210",
+       "file": "pdfs/bpl13210.pdf",
+       "md5": "8a08512baa9fa95378d9ad4b995947c7",
+       "link": true,
+       "pageLimit": 5,
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "tutorial",
        "file": "pdfs/tutorial.pdf",
        "md5": "6e122f618c27f3aa9a689423e3be6b8d",