commit a48547e542d36dcb7fe88b5296dc49ae3caf4231 Merge: 2e600e6 961b3d9 Author: Jerry James <jamesjer at localhost.localdomain> Date: Mon Aug 2 13:01:10 2010 -0600 Merge remote branch 'origin/f12/master' ---