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

[Paul W. Frields]

commit 6051b1bc7f4a0a1dda4f5b70da4a54d7ea0a1138
Merge: d12d129 d129178
Author: Paul W. Frields <stickster at gmail.com>
Date:   Thu Mar 1 09:16:46 2012 -0500

    Merge branch 'master' into el5

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