Merged changes from the 1.5.2p2 release.
diff --git a/Doc/texinputs/boilerplate.tex b/Doc/texinputs/boilerplate.tex
index 30bc37c..b1a07a4 100644
--- a/Doc/texinputs/boilerplate.tex
+++ b/Doc/texinputs/boilerplate.tex
@@ -1,8 +1,8 @@
\author{Guido van Rossum}
\authoraddress{
- Corporation for National Research Initiatives (CNRI) \\
- 1895 Preston White Drive, Reston, Va 20191, USA \\
+ Corporation for National Research Initiatives \\
+ 1895 Preston White Drive, Reston, VA 20191, USA \\
E-mail: \email{guido@python.org}
}