[mock/f14: 3/3] Merge branch 'master' into f14

[John Clark Williams]

commit 54997425fc902f25bcae6407f56b87d2986d2325
Merge: f1d6c2a e02a702
Author: Clark Williams <williams at redhat.com>
Date:   Fri Jan 13 13:41:01 2012 -0600

    Merge branch 'master' into f14

 .gitignore |    1 +
 mock.spec  |   13 ++++++++++++-
 sources    |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
---