commit 25a96f5f8c25a009c8185ff3b2ad9d948d765289 Merge: d8cacd3 94ea107 Author: Darryl L. Pierce <mcpierce at gmail.com> Date: Wed Mar 5 06:26:52 2014 -0500 Merge branch 'master' into f20 ---