Checkout
gsmith
committed
on 16 Apr 14
merge r1588065 from trunk
add change to makefile.win missing from r1588054
which was merged to 2.4 in r1588064