commit 1b7c31c8f04bcbd69a4240b7232ed370524a72f0 Merge: 79626fe 7277e20 Author: David Brown <david.brown at pnl.gov> Date: Tue Jul 24 10:56:16 2012 -0700 Merge branch 'f16' into el5 .gitignore | 3 +-- sources | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---