From: Edward Burns <edward.burns_at_oracle.com>
Date: Thu, 08 Jul 2010 13:27:18 -0400

I'm doing the following:

svn merge -r 8454:8455 https://mojarra.dev.java.net/svn/mojarra/branches/2_0_rev_a_BRANCH

I ran into two conflicts, which I did not merge:

C jsf-api/doc/standard-html-renderkit-base.xml
C jsf-api/doc/standard-html-renderkit.xml

I will merge these in tonight.

I ran the automated tests on the "2.0 Rev a" branch and the 2.1 HEAD and the tests ran to
completion in both places.

Ed