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

[Paul W. Frields]

commit 936e127b32d0b552e93236befd84942e12117d0c
Merge: 204c81d 67310df
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Aug 8 19:35:46 2011 -0400

    Merge branch 'master' into f15

 .gitignore                      |    1 +
 drupal6-video-fedora-README.txt |    6 ++++++
 drupal6-video.spec              |   37 +++++++++++++++++++++++--------------
 sources                         |    2 +-
 4 files changed, 31 insertions(+), 15 deletions(-)
---