* www/index.html:  merge the 1.0 and 1.1 features into a single list.
* www/index.html:  merge the 1.0 and 1.1 features into a single list.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion