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

[John Clark Williams]

commit ec9b57c369f2c06b55a2856a4630e1c6bd31088b
Merge: 0dd2e6d 85abec3
Author: Clark Williams <williams at redhat.com>
Date:   Fri Oct 14 09:25:30 2011 -0500

    Merge branch 'master' into el6

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