[perl-Cache-Memcached/f13/master: 6/6] Merge branch 'master' into f13

[Michael Fleming]

commit 853ca10fda35a568249d877f35329eeb41674bd2
Merge: 7d1f8dc 3306adf
Author: Michael Fleming <mfleming at thatfleminggent.com>
Date:   Fri Aug 27 19:11:23 2010 +1000

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                |    2 +-
 perl-Cache-Memcached.spec |   12 +++++++++---
 sources                   |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 0efa022,877c809..8d0f465
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Cache-Memcached-1.28.tar.gz
+ /Cache-Memcached-1.29.tar.gz