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

[Jon Ciesla]

commit 9d3a8a1220146f830bba75d9c7a5c3dba3fb67e5
Merge: 415a62b 34293bf
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu May 9 08:35:30 2013 -0500

    Merge branch 'el6' into el5

 drupal7.attr |    2 +-
 drupal7.spec |   15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)
---