[facter/el5] (2 commits) ...Merge branch 'master' into el5

[Todd Zullinger]

Summary of changes:

  6caf3cc... Update license tag, GPLv2+ -> ASL 2.0 (*)
  f06e09f... Merge branch 'master' into el5

(*) This commit already existed in another branch; no separate mail sent