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

author notmasteryet <async.processingjs@yahoo.com>

Wed, 12 Oct 2011 22:36:03 +0000 (17:36 -0500)

committer notmasteryet <async.processingjs@yahoo.com>

Wed, 12 Oct 2011 22:36:03 +0000 (17:36 -0500)
author notmasteryet <async.processingjs@yahoo.com>
Wed, 12 Oct 2011 22:36:03 +0000 (17:36 -0500)
committer notmasteryet <async.processingjs@yahoo.com>
Wed, 12 Oct 2011 22:36:03 +0000 (17:36 -0500)
diff --cc fonts.js
Simple merge
diff --cc pdf.js
Simple merge
author	notmasteryet <async.processingjs@yahoo.com>
	Wed, 12 Oct 2011 22:36:03 +0000 (17:36 -0500)
committer	notmasteryet <async.processingjs@yahoo.com>
	Wed, 12 Oct 2011 22:36:03 +0000 (17:36 -0500)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history