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

[Paul W. Frields]

commit def6a63ecdb7fdd4856d7100d16f9fc0b4e21434
Merge: d540ecd 61d6186
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Aug 8 17:27:38 2011 -0400

    Merge branch 'master' into f14

 .gitignore                          |    1 +
 drupal6-filefield-fedora-README.txt |    6 ++++++
 drupal6-filefield.spec              |   20 ++++++++++++++------
 sources                             |    2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)
---