Checkout
pburba
committed
on 12 Jul 12
On the inheritable-props branch: Sync with ^/subversion/trunk through
r1360860.