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

[Dan Mashal]

commit f1434ec0ddca2571f3c6572ca8e3d1a89767a808
Merge: fe6e53d 31af491
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Jul 24 09:32:55 2012 -0700

    Merge branch 'master' into f17

 mate-doc-utils.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---