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

[Paul W. Frields]

commit 7add9355c0d2a62aacd08bc65935483854d7c8c5
Merge: 51e4748 413b877
Author: Paul W. Frields <stickster at gmail.com>
Date:   Thu Feb 2 09:20:51 2012 -0500

    Merge branch 'master' into el5

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