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

[Todd Zullinger]

commit d7a307d4e0782785464ffe8657d5853f1a805f9d
Merge: 7f2e77f 3a4165f
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sat Aug 28 11:13:01 2010 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

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