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

[Todd Zullinger]

commit 625e6891763f859bf1ebe04fa3bc6f58d5d0ab94
Merge: 0797760 6caf3cc
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Jul 27 09:49:08 2011 -0400

    Merge branch 'master' into el6

 facter.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---