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

[John Clark Williams]

commit 8745df214f827a1a71fe0d05d31ab2a671c3e03b
Merge: 271a92e d8c652b
Author: Clark Williams <williams at redhat.com>
Date:   Thu Sep 8 13:13:55 2011 -0500

    Merge branch 'master' into f14

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