I agree with Ryan that there isn't enough time to be able to ship it out with 2.1. Although +1 for tagging and branching. Release 2.1 and then have a branch that includes Xinha and one that has TinyMCE that will be used for tagging bugfix releases. Any bugfix release can be tagged from the TinyMCE and the Xinha can be the trunk. -- Dave W