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

[John Clark Williams]

commit 1f44f92b313e6e50505715731f5d7ef383cd7aee
Merge: 2ff42b6 7ab8ddf
Author: Clark Williams <williams at redhat.com>
Date:   Mon Oct 31 17:07:36 2011 -0500

    Merge branch 'master' into f14

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