[man2html/f17: 6/6] Merge branch 'master' into f17

[T.C. Hollingsworth]

commit 494a28853998da5989f2f4e095786565caafe8b9
Merge: 992df94 87b4686
Author: T.C Hollingsworth <tchollingsworth at gmail.com>
Date:   Mon Jul 16 08:15:15 2012 -0400

    Merge branch 'master' into f17

 man2html-localized-manpage-paths.patch |   78 ++++++++++++++++++++++++++++++++
 man2html.spec                          |   35 +++++++-------
 2 files changed, 96 insertions(+), 17 deletions(-)
---