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

[John Clark Williams]

commit 45e86b94c598ca35230ef05b018ddd829759f82d
Merge: 5f83713 927de5b
Author: Clark Williams <williams at redhat.com>
Date:   Wed Jun 22 17:48:04 2011 -0500

    Merge branch 'master' into f14

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