Refactored the DND support to allow 1.5 to run
Authored by: luano 2007-10-16
Parent: [r1149]
Child: [r1151]