Roger committed [r401]

Commit by Roger. Minor {$IFDEF}s to make project compile on D2009. Should still compile on XE3.