commit 48d30f96e1120babdd6b35e00e79d80bcdaa320a Merge: c2b5325 8d10669 Author: Jerry James <jamesjer at localhost.localdomain> Date: Mon Aug 2 12:54:07 2010 -0600 Merge remote branch 'origin/f12/master' ---