commit dcbff768b69dcdaa8b48dee495f7ef8f05804966 Merge: ddd4230 3a4f89d Author: Nathaniel McCallum <nathaniel at natemccallum.com> Date: Fri Oct 8 23:12:29 2010 -0400 Merge branch 'el6' ---