[drupal6-image/el6: 3/3] Merge branch 'master' into el6

[Paul W. Frields]

commit bb54cf5556e98b137b8377e491c0da450468875c
Merge: fe0d570 0f0b545
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Apr 23 10:13:54 2012 -0400

    Merge branch 'master' into el6

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