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

[John Clark Williams]

commit 3bc7ef7b26a2e2f0e1d73905efbcc072c90ad095
Merge: 3ccc5fc 593f710
Author: Clark Williams <williams at redhat.com>
Date:   Fri May 13 13:52:05 2011 -0500

    Merge branch 'master' into f13

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