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

[John Clark Williams]

commit 0975cff87e030e38c3a08ded3d6e2b08449c9caf
Merge: 4033eba b328b71
Author: Clark Williams <williams at redhat.com>
Date:   Fri Jul 27 16:05:18 2012 -0500

    Merge branch 'master' into f17

 .gitignore |    1 +
 mock.spec  |   12 +++++++++++-
 sources    |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---