commit 8c65a0142344441eb04172e70166202d8dbca062 Merge: b021d6d 9c118e1 Author: Jerry James <jamesjer at localhost.localdomain> Date: Mon Aug 2 12:58:24 2010 -0600 Merge remote branch 'origin/f12/master' ---