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

[John Clark Williams]

commit b8205f6f95c9ac66e69bbf7aa283436d42b3f7d9
Merge: 9e8329f 46fd486
Author: Clark Williams <williams at redhat.com>
Date:   Sat Jan 14 11:28:43 2012 -0600

    Merge branch 'master' into el6

 mock.spec |    5 ++++-
 sources   |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---