[mock/el6: 2/2] Merge branch 'master' into el6

[John Clark Williams]

commit 5b449a99e7ec2a9bfa1ae4874b5b6114a552c4b7
Merge: fecf974 9a15127
Author: Clark Williams <williams at redhat.com>
Date:   Tue Jul 31 14:10:15 2012 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 mock.spec  |    6 +++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---