Whee, security fixes.
This was my first test of SVN vendor branches, and I managed to hork up the web directory pretty bad when I first did it, but a quick fresh checkout and everything was fine. Duly noted: When doing svn merges, don’t work on a live directory. Do a fresh checkout, merge, cleanup, checkin, and update your main tree.
Update: In case any of my three readers care, the underlying problem was that I forgot to make sure my vendor tags had a common ancestor, so stuff showed up as being replaced instead of being changed. Nothing a minute with the Subversion Book couldn’t fix.
Update: And now WordPress 2.0.7 is out. Hooray.