Checkout
cmpilato
committed
on 02 Aug 12
Merge recent trunk changes to the 'master-passphrase' branch.
(Merged /subversion/trunk:r1365672-1368648.)