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

[Michael Stahnke]

commit 8e8db7a0ea8c5f6ba56e6930e2dc52597e8883de
Merge: b01a1d7 b2df44b
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Tue Dec 4 10:37:06 2012 -0800

    Merge branch 'master' into el5

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