Merged with WordPress trunk r24040.
Merged with WordPress trunk r24041.
Merged with WordPress trunk r24042.
Merged with WordPress trunk r24043.