[puppet/el6] (3 commits) ...Merge branch 'master' into el6

[Todd Zullinger]

Summary of changes:

  65b5b66... Update to 2.6.12, fixes CVE-2011-3872 (*)
  47fcf33... Apply partial fix for upstream #9167 (*)
  eb50e17... Merge branch 'master' into el6

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