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

[Todd Zullinger]

commit 8093398534e1d774ff1f4b83a12cb9929f29f91c
Merge: fffd27e 4b98da9
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Apr 3 17:35:08 2013 -0400

    Merge branch 'master' into el6

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