trunk-tracking: update to r3581 (from r3537)
Merge pull request #550 from pagespeed/jefftk-update-trunk-tracking

trunk-tracking: update to r3581 (from r3537)