commit 47d2dee04dc0a34facd98d1ff6c809b92b9a9714 Merge: e52ba14 b23e48c Author: Paul Wouters <pwouters at redhat.com> Date: Wed Sep 26 17:52:12 2012 -0400 Merge branch 'el6' into el5 Conflicts: .gitignore sources ---