[facter/el5: 8/8] Merge branch 'master' into el5

[Todd Zullinger]

commit 141f88ee6e5d30dc2b87ccc15e13d2e21823185f
Merge: 5906873 d9094e4
Author: Todd Zullinger <tmz at pobox.com>
Date:   Tue Mar 19 10:10:18 2013 -0400

    Merge branch 'master' into el5

 .gitignore  |    5 +----
 facter.spec |   29 ++++++++++++++++++++++++++++-
 sources     |    4 ++--
 3 files changed, 31 insertions(+), 7 deletions(-)
---