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

[John Clark Williams]

commit 16349c29b16c2fec7a002ea346148029c080a54b
Merge: 5b449a9 75e3c7a
Author: Clark Williams <williams at redhat.com>
Date:   Mon Aug 6 12:30:13 2012 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 mock.spec  |    8 +++++---
 sources    |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---