Nick Belaevski
committed
on 18 Nov 10
Rest of tree work merged manually from GIT