Merged trunk changes r9797:9829 into 217update branch.
<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
<!--ArborText, Inc., 1988-1999, v.4002-->
<!ENTITY TIFFIsUpSampled-3tiff SYSTEM "TIFFquery.3tiff">
<!-- SHADOW_PAGE -->
]>
&TIFFIsUpSampled-3tiff