[python-shove/el6: 7/7] Merge branch 'master' into el6

[Luke Macken]

commit 20bbc638a26ee8985508a1bc5772cde5e98d7c5f
Merge: 88a5bf6 1b907ce
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Aug 2 15:31:01 2011 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 python-shove-setup.patch |   37 -------------------------------------
 python-shove.spec        |   20 +++++++++++++++-----
 sources                  |    2 +-
 3 files changed, 16 insertions(+), 43 deletions(-)
---