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

[John Clark Williams]

commit 0534a5e98c90b2e2796b35a480c4e26a5c699fe2
Merge: d9d842c d52e2d7
Author: Clark Williams <williams at redhat.com>
Date:   Thu Oct 14 17:02:35 2010 -0500

    Merge branch 'master' into f13

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