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

[John Clark Williams]

commit bfa17f4067628d3ab2a06ca6c94582bd2e025607
Merge: daecdbe e81efac
Author: Clark Williams <williams at redhat.com>
Date:   Sat Aug 14 09:13:12 2010 -0500

    Merge branch 'master' into f13

 .gitignore |    1 +
 mock.spec  |   12 +++++++++++-
 sources    |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 4b263a2,ac069e9..1a8447e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,2 @@@
 -mock-1.1.1.tar.gz
 -mock-1.1.2.tar.gz
  mock-1.1.3.tar.gz
+ mock-1.1.4.tar.gz