Partially completed. trunk revisions r10420, r10421
trunk revision r10426
Moving to new milestone, all changes to this point have been tagged in trunk-2010-02-27-01.