merged from trunk to branch

[SVN r36934]

people/joaquin_lopez.htm

@@ -40,8 +40,8 @@
   "http://www.upm.es">Polytechnic University of Madrid</a>. He currently
   works at <a href="http://www.tid.es">Telef&oacute;nica,
   Investigaci&oacute;n y Desarrollo</a>, the R&amp;D branch of the
-  Telef&oacute;nica Group, where he leads a small group of developers of
-  multimedia mobile applications. Though actual programming is not one of his
+  Telef&oacute;nica Group, where he leads a small group of engineers working on
+  advanced mobile services. Though actual programming is not one of his
   job responsibilities, he still does some C++ for fun when nobody's
   around.</p>
 
@@ -49,7 +49,7 @@
   Dragon 32 (a Tandy TRS-80 clone) at the age of 13, though at the time he
   probably was unaware of the future impact of this event. He enjoys
   Mathematics, Logic and Latin; his lower case interests include paper
-  folding, compulsory reading, travel and visiting all sorts of pubs and
+  folding, compulsive reading, travel and visiting all sorts of pubs and
   restaurants. You can contact him at <a href=
   "mailto:joaquin@tid.es">joaquin@tid.es</a>.<br clear="all"></p>
   <hr>
@@ -59,10 +59,10 @@
   height="31" width="88"></a></p>
 
   <p>Revised 
-  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->21
-  November, 2006<!--webbot bot="Timestamp" endspan i-checksum="39358" --></p>
+  <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->12
+  February, 2007<!--webbot bot="Timestamp" endspan i-checksum="39358" --></p>
 
-  <p><i>Copyright &copy; 2004 Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz</i></p>
+  <p><i>Copyright &copy; 2004-2007 Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz</i></p>
 
   <p><i>Distributed under the Boost Software License, Version 1.0. (See
   accompanying file <a href="../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy