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

[Todd Zullinger]

commit fffd27e915dbdf948d0a6509f05734ca34e7c48b
Merge: cd292d1 be66d28
Author: Todd Zullinger <tmz at pobox.com>
Date:   Tue Apr 2 21:52:17 2013 -0400

    Merge branch 'master' into el6

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