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

[John Clark Williams]

commit b707f0acdaf3d3e47973af7fb2e53059e6d12e43
Merge: 155406b db799ff
Author: Clark Williams <williams at redhat.com>
Date:   Fri Sep 17 16:31:28 2010 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 mock.spec  |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 1a8447e,a0bb8bd..74f5a62
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,3 @@@
 -mock-1.1.1.tar.gz
 -mock-1.1.2.tar.gz
  mock-1.1.3.tar.gz
  mock-1.1.4.tar.gz
+ /mock-1.1.5.tar.gz