[drupal6-video/el6: 3/3] Merge branch 'master' into el6

[Paul W. Frields]

commit cc8ee6a1a4e8613675d24801c85a9f8d4e4eae91
Merge: aa8ecf4 e5e6144
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Feb 20 16:51:46 2012 -0500

    Merge branch 'master' into el6

 .gitignore         |    1 +
 drupal6-video.spec |    8 +++++++-
 sources            |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---