2.5RC1 CVS/SVN (UNRELEASED)
