Subversion 1.5 Release Notes: Merge Tracking
Here’s one to file under about-frickin-time