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

[Paul W. Frields]

commit 19ed4fd1b4c285b8aba9ddafd0dbe3306b6d95b2
Merge: 6e1ad08 0595954
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Aug 8 17:43:12 2011 -0400

    Merge branch 'master' into f14

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