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

[Michael Stahnke]

commit cf1324caff16ab471ea511de8ff3d7fc4082b801
Merge: 344883e 6269ce9
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Wed Nov 7 16:19:18 2012 -0800

    Merge branch 'master' into el5

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