commit 1cf16ae73f516eff02252546f53b876995dc9099 Merge: b3f0c58 5030f25 Author: Jerry James <jamesjer at localhost.localdomain> Date: Mon Aug 2 12:55:46 2010 -0600 Merge remote branch 'origin/f12/master' ---