- Integrated calendar.class into calendar.class (just like we did for
  headline.class 2 or 3 weeks ago).