commit 38fb5a40b7d90eeff3cd2b59a916a5367fd2c78d Merge: 65ce074 29ae196 Author: Jerry James <jamesjer at localhost.localdomain> Date: Mon Aug 2 13:02:48 2010 -0600 Merge remote branch 'origin/f12/master' ---