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

[Michael Stahnke]

commit ba36e1bb97ac480bb85596b04e269975471cd3af
Merge: 3498edf b2df44b
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Tue Dec 4 10:46:07 2012 -0800

    Merge branch 'master' into el6

 .gitignore  |    1 +
 facter.spec |    5 ++++-
 sources     |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---