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

author notmasteryet <async.processingjs@yahoo.com>

Fri, 9 Dec 2011 01:20:33 +0000 (19:20 -0600)

committer notmasteryet <async.processingjs@yahoo.com>

Fri, 9 Dec 2011 01:20:33 +0000 (19:20 -0600)
author notmasteryet <async.processingjs@yahoo.com>
Fri, 9 Dec 2011 01:20:33 +0000 (19:20 -0600)
committer notmasteryet <async.processingjs@yahoo.com>
Fri, 9 Dec 2011 01:20:33 +0000 (19:20 -0600)
diff --cc src/core.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	notmasteryet <async.processingjs@yahoo.com>
	Fri, 9 Dec 2011 01:20:33 +0000 (19:20 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Fri, 9 Dec 2011 01:20:33 +0000 (19:20 -0600)
		1	2
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history