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

[John Clark Williams]

commit 431c0845be25d30e847774f18d67f237221f15b2
Merge: 4ce9e23 75e3c7a
Author: Clark Williams <williams at redhat.com>
Date:   Mon Aug 6 12:28:16 2012 -0500

    Merge branch 'master' into f17

 .gitignore |    1 +
 mock.spec  |    8 +++++---
 sources    |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---