[mock/f17: 3/3] Merge branch 'master' into f17

[John Clark Williams]

commit 35517565f5d77e9b6337af8f5f4e04c53a244ea8
Merge: fb3592d d10f258
Author: Clark Williams <williams at redhat.com>
Date:   Fri Sep 7 13:47:22 2012 -0500

    Merge branch 'master' into f17

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