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

[Nick Bebout]

commit 6b4a60859e0f727d1a0f29294440c5d6678ff72e
Merge: c40a1ce ee78133
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Jan 26 15:22:12 2011 -0600

    Merge branch 'master' into f14
    
    Conflicts:
    	drupal6-feeds.spec

---