I think I checked in an unclean version of trunk last time. This is based off of rev 663718 and is the latest trunk