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

[Paul W. Frields]

commit bb72920a514c63f4b0b3aa6ba349537c9c92f5a9
Merge: 7add935 2bfc2a4
Author: Paul W. Frields <stickster at gmail.com>
Date:   Thu May 3 08:06:29 2012 -0400

    Merge branch 'master' into el5

 .gitignore   |    1 +
 drupal7.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---