destinations. svn path=/trunk/; revision=25957
svn path=/trunk/; revision=24770
Also tidy up. svn path=/trunk/; revision=24013