Rewrote the intensity_generic() function.
This is now much simpler (5 lines of code).
Authored by: bugman 2009-10-07
Parent: [r9623]
Child: [r9625]