[drupal7/el5] (7 commits) ...Merge branch 'el6' into el5

[Jon Ciesla]

Summary of changes:

  38f4e15... New upstream - SA-CORE-2012-003 security update (*)
  bb4d5ba... Fix for httpd 2.4. (*)
  d170915... Fix fix. (*)
  44d3846... Update to 7.17. (*)
  af0cce5... Fix README.txt location. (*)
  f55fefe... 7.18 (*)
  71051d7... Merge branch 'el6' into el5

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