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

[Todd Zullinger]

commit 0bcf538fcebb3acebfc52d0eab85d40d56c06793
Merge: 12b3936 7f8ab51
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Mar 5 10:32:37 2012 -0500

    Merge branch 'master' into el5

 ...Preserve-timestamps-when-installing-files.patch |   29 +++++-----
 0001-Make-ec2-facts-work-on-CentOS-again.patch     |   57 --------------------
 facter-1.6.5.tar.gz.asc                            |   18 ------
 facter-1.6.6.tar.gz.asc                            |   17 ++++++
 facter.spec                                        |   47 +++++++++++-----
 sources                                            |    2 +-
 6 files changed, 65 insertions(+), 105 deletions(-)
---