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

[Todd Zullinger]

commit f38e9a643ab04e83169185a177bf8abdf5a738fe
Merge: 48ec60d 4b98da9
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Apr 3 17:35:10 2013 -0400

    Merge branch 'master' into el5

 ...lter-virt-what-warnings-from-virtual-fact.patch |   11 ++++++++---
 facter.spec                                        |    5 ++++-
 2 files changed, 12 insertions(+), 4 deletions(-)
---