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

[Todd Zullinger]

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

    Merge branch 'master' into el5

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