[drupal6-imagecache/f19: 3/3] Merge branch 'master' into f19

[Shawn Iwinski]

commit 67bd691060a6212bb9cd3b0a5e0cd61547bfedeb
Merge: 6d5970b 11460b3
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Jan 26 14:15:22 2014 -0500

    Merge branch 'master' into f19

 drupal6-imagecache-RPM-README.txt |    5 ++
 drupal6-imagecache.spec           |   84 ++++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 34 deletions(-)
---