[mate-doc-utils/f17: 7/7] Merge branch 'master' into f17

[Dan Mashal]

commit 8102d97fb97511cf8638444d9611768582cee880
Merge: 1a2c8fe 0d92258
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri May 10 02:47:59 2013 -0700

    Merge branch 'master' into f17

 .gitignore                  |    2 +
 fix_mock_build_errors.patch |  131 +++++++++++++++++++++++++++++++++++++++++++
 mate-doc-utils.spec         |   28 +++++++---
 sources                     |    2 +-
 4 files changed, 154 insertions(+), 9 deletions(-)
---