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

[Paul W. Frields]

commit 67b05c3194d1306ee5c5f04b1ce8d602ef579fb5
Merge: da08b1e 78393e7
Author: Paul W. Frields <stickster at gmail.com>
Date:   Thu Oct 27 20:47:48 2011 -0400

    Merge branch 'master' into el5

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