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

[John Clark Williams]

commit 4c194bdd0a9271542e19f15a402a0a9d2f8c7f72
Merge: d4267fa 9f2fec5
Author: Clark Williams <clark.williams at gmail.com>
Date:   Thu Apr 18 14:06:30 2013 -0500

    Merge branch 'master' into el6

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