Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into issue-600

author notmasteryet <async.processingjs@yahoo.com>

Sat, 8 Oct 2011 14:06:49 +0000 (09:06 -0500)

committer notmasteryet <async.processingjs@yahoo.com>

Sat, 8 Oct 2011 14:06:49 +0000 (09:06 -0500)
author notmasteryet <async.processingjs@yahoo.com>
Sat, 8 Oct 2011 14:06:49 +0000 (09:06 -0500)
committer notmasteryet <async.processingjs@yahoo.com>
Sat, 8 Oct 2011 14:06:49 +0000 (09:06 -0500)
diff --cc pdf.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	notmasteryet <async.processingjs@yahoo.com>
	Sat, 8 Oct 2011 14:06:49 +0000 (09:06 -0500)
committer	notmasteryet <async.processingjs@yahoo.com>
	Sat, 8 Oct 2011 14:06:49 +0000 (09:06 -0500)
		1	2
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history