Pull pstore into release branch
Tony Luck [Fri, 20 May 2011 17:34:50 +0000 (10:34 -0700)]

Trivial merge