commit 305332476e881598f7a0b7da38507dd5989d84de Merge: 06066f8 d275b13 07278b2 Author: Wes Hardaker <opensource at hardakers.net> Date: Thu Sep 9 17:02:06 2010 -0700 initial merge ---