Merge upstream.

author Brendan Dahl <brendan.dahl@gmail.com>

Thu, 29 Dec 2011 20:37:15 +0000 (12:37 -0800)

committer Brendan Dahl <brendan.dahl@gmail.com>

Thu, 29 Dec 2011 20:37:15 +0000 (12:37 -0800)
author Brendan Dahl <brendan.dahl@gmail.com>
Thu, 29 Dec 2011 20:37:15 +0000 (12:37 -0800)
committer Brendan Dahl <brendan.dahl@gmail.com>
Thu, 29 Dec 2011 20:37:15 +0000 (12:37 -0800)
diff --cc test/pdfs/.gitignore

index 3d636796d06c8537e043402bfb067e14316c9ceb,fd541a06d0c6433dd412ba4e0a55f780675c2582..9569807826a9e3134cbbe89305e082e754125b94
--- 1/test/pdfs/.gitignore
--- 2/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -20,5 -20,4 +20,5 @@@
   !scan-bad.pdf
   !freeculture.pdf
   !issue918.pdf
- 
+ !smaskdim.pdf
+ +!type4psfunc.pdf
author	Brendan Dahl <brendan.dahl@gmail.com>
	Thu, 29 Dec 2011 20:37:15 +0000 (12:37 -0800)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Thu, 29 Dec 2011 20:37:15 +0000 (12:37 -0800)