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

[Paul W. Frields]

commit 51e474800350c0c0a475aaaf31f6151d186b007c
Merge: 67b05c3 f1fe7dc
Author: Paul W. Frields <stickster at gmail.com>
Date:   Tue Dec 20 10:29:08 2011 -0500

    Merge branch 'master' into el5

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