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

[John Clark Williams]

commit d4267fad4545db400a2a4a436f3191368516dc01
Merge: 41c3672 fbf2e29
Author: Clark Williams <clark.williams at gmail.com>
Date:   Tue Apr 16 12:03:28 2013 -0500

    Merge branch 'master' into el6

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