change of CDT lead
diff --git a/team-leaders.html b/team-leaders.html
index 6a73b5a..850b3ca 100644
--- a/team-leaders.html
+++ b/team-leaders.html
@@ -1,196 +1,196 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-<title>Eclipse Tools Project</title>

-<link rel="stylesheet" href="../default_style.css" type="text/css">

-</head>

-<body>

-<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >

-  <tr> 

-    <td ALIGN=LEFT VALIGN=TOP COLSPAN="2" BGCOLOR="#0080C0"><b><font face="Arial,Helvetica" color="#FFFFFF">Who's 

-      running this project?</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-      <p>This page lists the people that are currently playing the PMC and subproject 

-        leadership roles described in the <a href="eclipsetools-charter.html">project 

-        charter</a>. We welcome new people who want to get involved and can make 

-        a contribution. The Eclipse Tools Project is a meritocracy. The more you 

-        contribute the more responsibility you will earn. </p>

-      <p>Our email addresses are show below in &quot;disguised&quot; form as a 

-        spam control measure. But we ask that you do not email us directly. Instead 

-        - use the mailing list for <a href="mailto:tools-dev@eclipse.org">tools</a>. 

-        Additional <a href="../mail/index.html" target="_top">mailing lists</a> 

-        have been set up for each subproject, and are the best way for developers 

-        to get involved.</p>

-      <p>The Eclipse Tools Project is managed by a small group known as the Eclipse 

-        Tools Project Management Committee (<a href="eclipsetools-charter.html#PMC">PMC</a>). 

-        The work of the Project will be organized into subprojects, much like 

-        the Eclipse Project itself. Each subproject has a leader who has overall 

-        responsibility for its success. Large subprojects are further divided 

-        into component teams, each of who has a leader that is responsible for 

-        its overall success.</p>

-      </td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Project 

-      Management Committee</font></b></td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=RIGHT valign=TOP>&nbsp;</td>

-    <td> 

-      <p><b>John Duimovich (john_duimovich at ca.ibm.com)</b><br>

-        John Duimovich, IBM distinguished engineer, has been the lead designer 

-        and implementor for OTI/IBM&#146;s virtual machine technology for the 

-        past ten years. He has designed virtual machines for a wide range of platforms, 

-        from the implementations for embedded and real time systems to those for 

-        IBM mainframe systems. John has played a key role in the development of 

-        ENVY/Smalltalk, VA/Micro Edition, and VA/Java Java IDEs. John serves as 

-        the lead of the Eclipse Tools PMC. He is also a member of the Eclipse 

-        Technology PMC. </p>

-      </td>

-  </tr>

-  <tr> 

-    <td align=RIGHT valign=TOP>&nbsp;</td>

-    <td>

-      <p><b>Erich Gamma (erich_gamma at ch.ibm.com)</b><br>

-        Erich is the lead of the Eclipse Java development environment. Prior to 

-        working on Eclipse Erich has contributed to VA/Micro Edition (part of 

-        IBM's Java solution for embedded device programming). Erich is well known 

-        for his work on Design Patterns and <a href="http://www.junit.org/" target="_top">JUnit</a>. 

-        Erich is leader of the JDT subproject, and component lead for the JDT 

-        UI. Erich is also a member of the <a href="../eclipse/team-leaders.html"> 

-        Platform PMC</a>.</p>

-      </td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Subproject 

-      Leaders</font></b></td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr bgcolor="#999999"> 

-    <td align=left valign=top colspan="2"><b>

-		<font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>

-		<a href="http://www.eclipse.org/cdt" target="_top" class="bar">C/C++ Subproject</a> 

-		</font></b>

-	</td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=RIGHT valign=TOP>&nbsp;</td>

-    <td> 

-      <p><b>Sebastien Marineau (sebastien at qnx.com)</b><br>

-        Sebastien is the lead of the <a href="http://www.eclipse.org/cdt" target="_top">C/C++ 

-        subproject. </a></p>

-    </td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr bgcolor="#999999"> 

-    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>

-	<a href="http://www.eclipse.org/gef" target="_top" class="bar">GEF Subproject</a> </font></b></td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=RIGHT valign=TOP>&nbsp;</td>

-    <td> 

-      <p><b>Randy Hudson (hudsonr at us.ibm.com)</b><br>

-        Randy is the lead of the <a href="http://www.eclipse.org/gef" target="_top">GEF 

-        subproject. </a></p>

-    </td>

-  </tr>

-</table>

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr bgcolor="#999999"> 

-    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>

-	<a href="http://www.eclipse.org/emf" target="_top" class="bar">EMF Subproject</a> </font></b></td>

-  </tr>

-</table>

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td width="4%" height="103" align=RIGHT valign=TOP>&nbsp;</td>

-    <td width="96%"> 

-      <p><p><strong>Ed Merks, IBM (merks at ca.ibm.com) </strong><br>

-        Ed is the lead architect of the XSD technology project and a co-architect 

-        of the EMF tools project. Currently a developer at IBM's Toronto Lab, 

-        he has twenty years of in-depth experience in the design and implementations 

-        of languages and their supporting environments, including a Ph.D in the 

-        subject. Ed was a lead architect of the IDE for Visual Age C++, a precursor 

-        to Eclipse's JFace, and has recently worked on a common mapping framework 

-        and a simple bean generator, both used in WebSphere Studio. </p>

-    </td>

-  </tr>

-</table>

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr bgcolor="#999999"> 

-    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>

-	<a href="http://www.eclipse.org/cobol" target="_top" class="bar">Cobol Subproject</a> </font></b></td>

-  </tr>

-</table>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=RIGHT valign=TOP>&nbsp;</td>

-    <td> 

-      <p><b>Ron Langer (rjl at fsw.fujitsu.com) </b><br>

-        Ron is the lead of the <a href="http://www.eclipse.org/cobol" target="_top">Cobol 

-        IDE subproject</a></p>

-      </td>

-  </tr>

-</table>

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr bgcolor="#999999"> 

-    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff">

-	<a name="pde"></a><a href="http://www.eclipse.org/ve" target="_top" class="bar">Visual Editor Subproject</a> </font></b></td>

-  </tr>

-</table>

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=RIGHT valign=TOP>&nbsp;</td>

-    <td> 

-      <p><b>David Orme (DaveO at ASC-iSeries.com) </b><br>

-        David is the lead <a href="http://www.eclipse.org/ve" target="_top">VE 

-        subproject</a></p>

-    </td>

-  </tr>  

-</table>

-

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr bgcolor="#999999"> 

-    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff">

-	<a name="pde"></a><a href="http://www.eclipse.org/uml2" target="_top" class="bar">UML2 Subproject</a> </font></b></td>

-  </tr>

-</table>

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=RIGHT valign=TOP>&nbsp;</td>

-    <td> 

-      <p><b>Kenn Hussey  (khussey at ca.ibm.com) </b><br>

-        Kenn is the lead <a href="http://www.eclipse.org/ve" target="_top">UML2 

-        subproject</a></p>

-    </td>

-  </tr>  

-</table>

-

-

-<p>&nbsp;</p>

-<p>&nbsp;</p>

-<p>&nbsp;</p>

-</body>

-</html>

+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Eclipse Tools Project</title>
+<link rel="stylesheet" href="../default_style.css" type="text/css">
+</head>
+<body>
+<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >
+  <tr> 
+    <td ALIGN=LEFT VALIGN=TOP COLSPAN="2" BGCOLOR="#0080C0"><b><font face="Arial,Helvetica" color="#FFFFFF">Who's 
+      running this project?</font></b></td>
+  </tr>
+  <tr> 
+    <td> 
+      <p>This page lists the people that are currently playing the PMC and subproject 
+        leadership roles described in the <a href="eclipsetools-charter.html">project 
+        charter</a>. We welcome new people who want to get involved and can make 
+        a contribution. The Eclipse Tools Project is a meritocracy. The more you 
+        contribute the more responsibility you will earn. </p>
+      <p>Our email addresses are show below in &quot;disguised&quot; form as a 
+        spam control measure. But we ask that you do not email us directly. Instead 
+        - use the mailing list for <a href="mailto:tools-dev@eclipse.org">tools</a>. 
+        Additional <a href="../mail/index.html" target="_top">mailing lists</a> 
+        have been set up for each subproject, and are the best way for developers 
+        to get involved.</p>
+      <p>The Eclipse Tools Project is managed by a small group known as the Eclipse 
+        Tools Project Management Committee (<a href="eclipsetools-charter.html#PMC">PMC</a>). 
+        The work of the Project will be organized into subprojects, much like 
+        the Eclipse Project itself. Each subproject has a leader who has overall 
+        responsibility for its success. Large subprojects are further divided 
+        into component teams, each of who has a leader that is responsible for 
+        its overall success.</p>
+      </td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Project 
+      Management Committee</font></b></td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=RIGHT valign=TOP>&nbsp;</td>
+    <td> 
+      <p><b>John Duimovich (john_duimovich at ca.ibm.com)</b><br>
+        John Duimovich, IBM distinguished engineer, has been the lead designer 
+        and implementor for OTI/IBM&#146;s virtual machine technology for the 
+        past ten years. He has designed virtual machines for a wide range of platforms, 
+        from the implementations for embedded and real time systems to those for 
+        IBM mainframe systems. John has played a key role in the development of 
+        ENVY/Smalltalk, VA/Micro Edition, and VA/Java Java IDEs. John serves as 
+        the lead of the Eclipse Tools PMC. He is also a member of the Eclipse 
+        Technology PMC. </p>
+      </td>
+  </tr>
+  <tr> 
+    <td align=RIGHT valign=TOP>&nbsp;</td>
+    <td>
+      <p><b>Erich Gamma (erich_gamma at ch.ibm.com)</b><br>
+        Erich is the lead of the Eclipse Java development environment. Prior to 
+        working on Eclipse Erich has contributed to VA/Micro Edition (part of 
+        IBM's Java solution for embedded device programming). Erich is well known 
+        for his work on Design Patterns and <a href="http://www.junit.org/" target="_top">JUnit</a>. 
+        Erich is leader of the JDT subproject, and component lead for the JDT 
+        UI. Erich is also a member of the <a href="../eclipse/team-leaders.html"> 
+        Platform PMC</a>.</p>
+      </td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Subproject 
+      Leaders</font></b></td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr bgcolor="#999999"> 
+    <td align=left valign=top colspan="2"><b>
+		<font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>
+		<a href="http://www.eclipse.org/cdt" target="_top" class="bar">C/C++ Subproject</a> 
+		</font></b>
+	</td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=RIGHT valign=TOP>&nbsp;</td>
+    <td> 
+      <p><b> Doug Schaefer(DSchaefer at qnx.com)</b><br>
+        Sebastien is the lead of the <a href="http://www.eclipse.org/cdt" target="_top">C/C++ 
+        subproject. </a></p>
+    </td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr bgcolor="#999999"> 
+    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>
+	<a href="http://www.eclipse.org/gef" target="_top" class="bar">GEF Subproject</a> </font></b></td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=RIGHT valign=TOP>&nbsp;</td>
+    <td> 
+      <p><b>Randy Hudson (hudsonr at us.ibm.com)</b><br>
+        Randy is the lead of the <a href="http://www.eclipse.org/gef" target="_top">GEF 
+        subproject. </a></p>
+    </td>
+  </tr>
+</table>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr bgcolor="#999999"> 
+    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>
+	<a href="http://www.eclipse.org/emf" target="_top" class="bar">EMF Subproject</a> </font></b></td>
+  </tr>
+</table>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td width="4%" height="103" align=RIGHT valign=TOP>&nbsp;</td>
+    <td width="96%"> 
+      <p><p><strong>Ed Merks, IBM (merks at ca.ibm.com) </strong><br>
+        Ed is the lead architect of the XSD technology project and a co-architect 
+        of the EMF tools project. Currently a developer at IBM's Toronto Lab, 
+        he has twenty years of in-depth experience in the design and implementations 
+        of languages and their supporting environments, including a Ph.D in the 
+        subject. Ed was a lead architect of the IDE for Visual Age C++, a precursor 
+        to Eclipse's JFace, and has recently worked on a common mapping framework 
+        and a simple bean generator, both used in WebSphere Studio. </p>
+    </td>
+  </tr>
+</table>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr bgcolor="#999999"> 
+    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff"><a name="pde"></a>
+	<a href="http://www.eclipse.org/cobol" target="_top" class="bar">Cobol Subproject</a> </font></b></td>
+  </tr>
+</table>
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=RIGHT valign=TOP>&nbsp;</td>
+    <td> 
+      <p><b>Ron Langer (rjl at fsw.fujitsu.com) </b><br>
+        Ron is the lead of the <a href="http://www.eclipse.org/cobol" target="_top">Cobol 
+        IDE subproject</a></p>
+      </td>
+  </tr>
+</table>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr bgcolor="#999999"> 
+    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff">
+	<a name="pde"></a><a href="http://www.eclipse.org/ve" target="_top" class="bar">Visual Editor Subproject</a> </font></b></td>
+  </tr>
+</table>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=RIGHT valign=TOP>&nbsp;</td>
+    <td> 
+      <p><b>David Orme (DaveO at ASC-iSeries.com) </b><br>
+        David is the lead <a href="http://www.eclipse.org/ve" target="_top">VE 
+        subproject</a></p>
+    </td>
+  </tr>  
+</table>
+
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr bgcolor="#999999"> 
+    <td align=left valign=top colspan="2"><b><font face="Arial,Helvetica" color="#ffffff">
+	<a name="pde"></a><a href="http://www.eclipse.org/uml2" target="_top" class="bar">UML2 Subproject</a> </font></b></td>
+  </tr>
+</table>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+  <tr> 
+    <td align=RIGHT valign=TOP>&nbsp;</td>
+    <td> 
+      <p><b>Kenn Hussey  (khussey at ca.ibm.com) </b><br>
+        Kenn is the lead <a href="http://www.eclipse.org/ve" target="_top">UML2 
+        subproject</a></p>
+    </td>
+  </tr>  
+</table>
+
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>