RamesesDev/etracs2.1 — pull request #1 by jzamss (2012-06-27 11:36:11+00:00)
Title: Merge from latest laptop code

Signed-off-by: Jessie S. Zamora