CVS activity by user 'bill': docs icfoundation.sdf,1.9,1.10 Update of /anon_cvs/repository/docs In directory developer.akopia.com:/tmp/cvs-serv20561 Modified Files: icfoundation.sdf Log Message: Resolved CVS conflict