[python-feedcache/el6: 6/6] Merge branch 'master' into el6

[Luke Macken]

commit 376e1dc8bbfd9188c69e8600d847496f031175cf
Merge: bd723ea d9de7ce
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Aug 2 14:38:24 2011 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 python-feedcache.spec |   13 +++++++++++--
 sources               |    2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)
---