* Shuffled some code around in serv_calendar.c