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

[Todd Zullinger]

Summary of changes:

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

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