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