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

[John Clark Williams]

commit acbc8f2874b992b50e446a7b025d967a5717294d
Merge: 59206f2 da7fc26
Author: Clark Williams <williams at redhat.com>
Date:   Sun Nov 27 17:30:30 2011 -0600

    Merge branch 'master' into el6

 mock.spec |  143 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 80 insertions(+), 63 deletions(-)
---