Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6

Conflicts:
	test/test_manifest.json

test/pdfs/issue1055.pdf.link

@@ -0,0 +1 @@
+http://mcpherrin.ca/code/mozilla/engl208b.pdf

test/test.py

@@ -9,7 +9,7 @@ USAGE_EXAMPLE = "%prog"
 # The local web server uses the git repo as the document root.
 DOC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),".."))
 
-ANAL = True
+GIT_CLONE_CHECK = True
 DEFAULT_MANIFEST_FILE = 'test_manifest.json'
 EQLOG_FILE = 'eq.log'
 BROWSERLOG_FILE = 'browser.log'
@@ -344,7 +344,7 @@ def verifyPDFs(manifestList):
 
 def setUp(options):
     # Only serve files from a pdf.js clone
-    assert not ANAL or os.path.isfile('../src/pdf.js') and os.path.isdir('../.git')
+    assert not GIT_CLONE_CHECK or os.path.isfile('../src/pdf.js') and os.path.isdir('../.git')
 
     if options.masterMode and os.path.isdir(TMPDIR):
         print 'Temporary snapshot dir tmp/ is still around.'

test/test_manifest.json

@@ -416,5 +416,12 @@
        "md5": "d0b6137846df6e0fe058f234a87fb588",
        "rounds": 1,
        "type": "eq"
+    },
+    {  "id": "issue1055",
+      "file": "pdfs/issue1055.pdf",
+      "md5": "3ba56c2e48dce81da8669b1b9cf98ff0",
+      "rounds": 1,
+      "link": true,
+      "type": "eq"
     }
 ]