commit bf95d2e0c2ec3297e21a3a9dd5e4713a5a6886e7 Merge: f6f4f08 977048b Author: Ken Dreyer <ktdreyer at ktdreyer.com> Date: Wed Nov 23 17:24:20 2011 -0700 Merge branch 'el6' ---