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

[John Clark Williams]

commit 056a213aa2c18dfa803834830dfac676faee587f
Merge: 0636cc0 cd46534
Author: Clark Williams <williams at redhat.com>
Date:   Thu Jun 21 13:45:54 2012 -0500

    Merge branch 'master' into el6

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