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

Mon Mar 5 15:34:17 UTC 2012

commit 509df4c0ef0f2b96aa17cc236bdd3d9f17bb8c25
Merge: 9919be1 7f8ab51
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Mar 5 10:32:37 2012 -0500

    Merge branch 'master' into el6

 ...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(-)
---