Checkout
cmpilato
committed
on 13 Aug 12
On the 'master-passphrase' branch: sync with recent trunk changes.
(Merged /subversion/trunk:r1370242-1372417.)