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

[John Clark Williams]

commit e6cef20cb01d183f6130bb29688a6a08989b5d19
Merge: a748de4 d10f258
Author: Clark Williams <williams at redhat.com>
Date:   Fri Sep 7 13:49:25 2012 -0500

    Merge branch 'master' into el6

 mock.spec |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)
---