Incorrect timeout date calculated when schedule has a combination of non-wildcard day-of-week and non-wildcard day-of-month

The EJB3.1 spec (section 18.2.1.2) says this:

<quote>
If dayOfMonth has a non-wildcard value and dayOfWeek has a non-wildcard value, then either the dayOfMonth field or the dayOfWeek field must match the current day (even though the other of the two fields need not match the current day).
</quote>

However, we currently "and" (instead of "or") the day-of-month and "day-of-week" for non-wildcard values during timeout computation.