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

[Michael Stahnke]

commit c621fe4beaf96afbd5f14f9b435d44d48677c5e1
Merge: 8c2d32e 6269ce9
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Wed Nov 7 16:32:57 2012 -0800

    Merge branch 'master' into el6

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