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

[Paul W. Frields]

commit 74b3aa1055649e64b771878a6ba9daf11e018e22
Merge: a07b8c7 0595954
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Aug 8 17:42:16 2011 -0400

    Merge branch 'master' into f15

 drupal6-image-fedora-README.txt |    6 ++++++
 drupal6-image.spec              |   19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
---