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

[Paul W. Frields]

commit e34f3819daa7b65edf839d2fa12f47e8611e57d3
Merge: 74b3aa1 0f0b545
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Apr 23 10:12:09 2012 -0400

    Merge branch 'master' into f15

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