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

[John Clark Williams]

commit 6d826c9fd695fcf2e0ab372fb39f529286eeab7c
Merge: ec9b57c 7ab8ddf
Author: Clark Williams <williams at redhat.com>
Date:   Mon Oct 31 17:08:11 2011 -0500

    Merge branch 'master' into el6

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