As far as I can tell, all of the merge-able changes from the HEAD branch and now in the RELENG_1 branch. If anyone finds anything I've missed, please let me know. Barring any new changes to the HEAD branch, the current Chora RELENG_1 code will become Chora 1.2. -- Jon Parise (jon@horde.org) :: The Horde Project (http://horde.org/)