[drupal7/el5: 2/2] Merge branch 'el6' into el5

[Jon Ciesla]

commit 5c5b6a2419782bc445736f2d2ecce5ed8adf245e
Merge: bb72920 295f409
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu May 24 07:48:15 2012 -0500

    Merge branch 'el6' into el5

 drupal-7.14-CVE-2012-2922.patch |   10 ++++++++++
 drupal7.spec                    |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---