commit 5a6643e9d25a65115f64b111e7571bc185d58851 Merge: 5b1c993 44ae315 317f5d9 Author: Wes Hardaker <opensource at hardakers.net> Date: Tue Aug 24 12:19:47 2010 -0700 merge for setup ---