[facter/el4/master: 16/16] Merge branch 'master' into el4

[Todd Zullinger]

commit 6d7aff0c9073b7b45fc40baae99165e6ceb87a67
Merge: ce57d78 3a4165f
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sat Aug 28 11:16:33 2010 -0400

    Merge branch 'master' into el4

 .gitignore                                         |    6 +++-
 ...7-facts-hanging-on-_proc_xen_capabilities.patch |   28 --------------------
 facter-1.5.8.tar.gz.sign                           |   17 ++++++++++++
 facter.spec                                        |   14 +++++-----
 sources                                            |    2 +-
 5 files changed, 30 insertions(+), 37 deletions(-)
---