vchoi_fork

[svn-r1898] backed out the changes that were breaking the test cases until i can
figure a way to fix the problem.  decided to back it out since i will
be leaving for christmas in a few days and won't be back until jan.