commit 08f234c42b440aafc2150f05cc2d7aac35ad319f Merge: 47416f9 690c484 Author: Matt Domsch <Matt_Domsch at dell.com> Date: Fri Aug 6 13:45:06 2010 -0500 Merge branch 'master' into el6 ---