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

[John Clark Williams]

commit 3f67945a12bf87f93c163c876a6808353fc6bf04
Merge: 16349c2 62c16ae
Author: Clark Williams <williams at redhat.com>
Date:   Fri Sep 7 13:32:33 2012 -0500

    Merge branch 'master' into el6

 .gitignore                 |    1 +
 0001-add-f18-configs.patch |  515 ++++++++++++++++++++++++++++++++++++++++++++
 mock.spec                  |    2 +-
 sources                    |    2 +-
 4 files changed, 518 insertions(+), 2 deletions(-)
---