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

[Todd Zullinger]

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

    Merge branch 'master' into el6

 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(-)
---