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

[Todd Zullinger]

commit 9919be17a96088948578419c564fd628eb5dbf77
Merge: 1115968 d0469a4
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Feb 15 12:21:04 2012 -0500

    Merge branch 'master' into el6

 0001-Make-ec2-facts-work-on-CentOS-again.patch     |   57 ++++++++++++++++
 ...Preserve-timestamps-when-installing-files.patch |   70 ++++++++++++++++++++
 facter.spec                                        |   59 +++++++++++++----
 3 files changed, 173 insertions(+), 13 deletions(-)
---