commit c333786d5a01f44b238875645b20382bacb62d7e Merge: 108046e 364d257 087b07f Author: Wes Hardaker <opensource at hardakers.net> Date: Thu Sep 9 17:10:28 2010 -0700 initial merge ---