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

[John Clark Williams]

commit 07a80574d9f5dd1b64f6ae27cd95394855a561bb
Merge: 55d0cd8 56e3469
Author: Clark Williams <clark.williams at gmail.com>
Date:   Wed Oct 30 09:09:33 2013 -0500

    Merge branch 'master' into el6

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