psol: updating from r2748
trunk-tracking: built relase binaries off of r2748
trunk-tracking: built debug binaries off of r2748