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

[Todd Zullinger]

commit b919ba98c8ea4f1269515fe46a13775918bd926a
Merge: fb8a95b 3a4165f
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sat Aug 28 11:12:16 2010 -0400

    Merge branch 'master' into f12
    
    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(-)
---