Original commit message from CVS: Fix the compile error
Original commit message from CVS: fixing *wtay*'s code
Original commit message from CVS: moving stuff