commit 0c0e80d2f2f2379c5d5f26f62bbbd9c604d2bd7c Merge: 3848b96 ebf1137 Author: Nick Bebout <nb at fedoraproject.org> Date: Sun Aug 14 15:11:46 2011 -0500 Merge branch 'master' into f14 ---