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

[John Clark Williams]

commit f1d6c2a40a9f8034971f9bcf92175b95ce9228bc
Merge: b41111f da7fc26
Author: Clark Williams <williams at redhat.com>
Date:   Sun Nov 27 17:30:01 2011 -0600

    Merge branch 'master' into f14

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