vchoi_fork

[svn-r2232] removed the conditional compile statements that we were going to use
for the merged tools lib since these files do not require the tools lib