applied patch by ruben01 to add finer granularity
Authored by: matzon 2011-01-19
Parent: [r3471]
Child: [r3473]
