trunk-tracking: update from r3852 to r3872
Merge pull request #648 from pagespeed/jmaessen-trunk-tracking

trunk-tracking: update from r3852 to r3872
note that it will only compile against mod_pagespeed r3872 if you first patch in r3889