Trunk is now 6.1.0-SNAPSHOT and development can continue as normal towards the 6.1.0 release. The 6.0.x branch was created off of trunk revision 622 and will be used to actually cut the 6.0.0 release (which was delayed by a variety of minor set backs) tomorrow. Steve