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

[Paul W. Frields]

commit a4e80ae450e5411b0a05309a3ddf5a537db28efb
Merge: db2e3e1 463fb0c
Author: Paul W. Frields <stickster at gmail.com>
Date:   Sun Aug 7 14:18:05 2011 -0400

    Merge branch 'master' into el5

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