[redis/f17: 6/6] Merge branch 'master' into f17

[Silas Sewell]

commit 69b487ff9e0795b85682e4089166f610c1e1dd33
Merge: 4fba3d3 1d56211
Author: Silas Sewell <silas at sewell.org>
Date:   Sun Jul 8 21:54:04 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	redis.spec
    	sources

 .gitignore |    1 +
 redis.spec |   12 +++++++++---
 sources    |    1 +
 3 files changed, 11 insertions(+), 3 deletions(-)
---