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

[Todd Zullinger]

commit 48ec60d78dba3fc630e2af613a09d6fa291cf1d3
Merge: 141f88e be66d28
Author: Todd Zullinger <tmz at pobox.com>
Date:   Tue Apr 2 21:52:24 2013 -0400

    Merge branch 'master' into el5

 ...lter-virt-what-warnings-from-virtual-fact.patch |   68 ++++++++++++++++++++
 facter.spec                                        |    9 ++-
 2 files changed, 76 insertions(+), 1 deletions(-)
---