commit 900b3f144bda53754a990eec93926a500198b093 Merge: 854a82a 813ca6c Author: Nick Bebout <nb at fedoraproject.org> Date: Tue Oct 18 20:13:38 2011 -0500 Merge branch 'el6' into el5 Makefile | 14 ++++++++++++++ sources | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) ---