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

[John Clark Williams]

commit 59206f21e49aa8b38e561732050363c7743a0c47
Merge: 6d826c9 7711100
Author: Clark Williams <williams at redhat.com>
Date:   Sun Nov 27 17:24:14 2011 -0600

    Merge branch 'master' into el6

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