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

[John Clark Williams]

commit e0d6ac3ddd29403bd43241a1314d3e7254d35168
Merge: 81d751e fbf2e29
Author: Clark Williams <clark.williams at gmail.com>
Date:   Tue Apr 16 12:02:27 2013 -0500

    Merge branch 'master' into f17

 .gitignore |    1 +
 mock.spec  |   47 +++++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 43 insertions(+), 7 deletions(-)
---