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

[John Clark Williams]

commit 2ff42b69237e94c6aff290b75c43a14b217aac4f
Merge: 92bd0a5 85abec3
Author: Clark Williams <williams at redhat.com>
Date:   Fri Oct 14 09:25:05 2011 -0500

    Merge branch 'master' into f14

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