CVS commit by eros: 

Synced to HEAD. Merging security fixes in xpdf.


  M +14 -0     Catalog.cc   1.4.2.1
  M +111 -49   XRef.cc   1.4.2.1