trunk-tracking: we depend on r2577 now
psol: updating from r2577