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

[John Clark Williams]

commit 82b6fd1f29c534cb7ad5f3a8bfce517b63c4ec36
Merge: 0119607 b8a015d
Author: Clark Williams <williams at redhat.com>
Date:   Sat Feb 19 09:41:15 2011 -0600

    Merge branch 'master' into f14

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