Merging 17824:17845 from trunk to blocking branch.
authorMatt Amos <zerebubuth@gmail.com>
Tue, 29 Sep 2009 10:23:31 +0000 (10:23 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Tue, 29 Sep 2009 10:23:31 +0000 (10:23 +0000)
commit09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4
treec3a69a89f0491883169203acb9bc69f19e0b5425
parent30d5e783e478789d2454e85c6d5b621b07a11081
parent801182d2ead71631621dbd77dec486f6646f10a6
Merging 17824:17845 from trunk to blocking branch.