[drupal7-feeds/f16: 3/3] Merge branch 'master' into f16

[Jared Smith]

commit 7921fac1e27ceecc56b4c04dba4132b1a7dc6aa0
Merge: a68d0f0 d361616
Author: Jared K. Smith <jsmith at fedoraproject.org>
Date:   Thu Oct 25 17:24:41 2012 -0400

    Merge branch 'master' into f16

 .gitignore         |    1 +
 drupal7-feeds.spec |    7 +++++--
 sources            |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index b5a4f2c,29b5ed5..84f082f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/feeds-7.x-2.0-alpha4.tar.gz
  /feeds-7.x-2.0-alpha6.tar.gz
+ /feeds-7.x-2.0-alpha7.tar.gz