[man2html/f16: 5/5] Merge branch 'master' into f16

[T.C. Hollingsworth]

commit 4e5d7271d074e0be0ab51177da40412f9909e695
Merge: d8f68bf a367ab4
Author: T.C Hollingsworth <tchollingsworth at gmail.com>
Date:   Mon Jul 16 07:44:20 2012 -0400

    Merge branch 'master' into f16

 man2html-localized-manpage-paths.patch |   78 ++++++++++++++++++++++++++++++++
 man2html.spec                          |   19 ++++++--
 2 files changed, 93 insertions(+), 4 deletions(-)
---