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

[Todd Zullinger]

commit 61386503b24acf2a3ad9b0f7b161415903fc0071
Merge: cbb457b db090e7
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Jan 26 11:14:28 2012 -0500

    Merge branch 'master' into el5

 facter-1.6.4.tar.gz.asc |   18 ------------------
 facter-1.6.5.tar.gz.asc |   18 ++++++++++++++++++
 facter.spec             |    8 +++++++-
 sources                 |    2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)
---