State of branches and release

Hi all,

Currently, we have :

- 2_0_X :
* with the patch provide by Doug ( bug on publish present in 2.0.3 release)

- 2_1_x :
* patched for publishing bug
* is java 6 compliant
* have a clean editor status.

- Trunk :
* lenya with c2.2
* compilation is ok (just a little test fail)
* many little components configurations have to be done for a working 
version.

What did we do ?

3 branches are too many to maintain imo - we are not enough big for this.

We have to "close" one I think.

I propose to release the 2_0_x on 2.0.4 for reflect the bug solving and 
continue work on trunk and 2.1.x.

What do you think about this ?

++