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

[John Clark Williams]

commit 271a92e7fea23665e0ae185866aece9c2a89d1f9
Merge: 45e86b9 95e8735
Author: Clark Williams <williams at redhat.com>
Date:   Tue Jul 26 14:26:33 2011 -0500

    Merge branch 'master' into f14

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