rolled back conditional compiles. Did not roll back the porting to Timer1.
Authored by: jelle_boomstra 2010-02-15
Parent: [r9]