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

[John Clark Williams]

commit 2d4ce267738d3a88392ac397e88189c7f0386fb9
Merge: 3bc7ef7 927de5b
Author: Clark Williams <williams at redhat.com>
Date:   Wed Jun 22 17:49:25 2011 -0500

    Merge branch 'master' into f13

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