[memcached: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/memcached

[Paul Lindner]

commit fbf7fd4b962cc24de33a41f827d12b4b7701976e
Merge: f45a5bc 872f4fc
Author: Paul Lindner <lindner at inuus.com>
Date:   Tue Aug 2 18:10:45 2011 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/memcached
    
    Conflicts:
    	memcached.spec

 memcached-1.4.5-warnings.patch |   30 +++++++++++++++++++
 memcached.fc                   |    2 -
 memcached.if                   |    1 -
 memcached.spec                 |    5 ++-
 memcached.te                   |   61 ----------------------------------------
 5 files changed, 34 insertions(+), 65 deletions(-)
---
diff --cc memcached.spec
index 6227530,7835de4..cf99a5c
--- a/memcached.spec
+++ b/memcached.spec
@@@ -147,9 -147,9 +147,12 @@@ exit 
  %{_includedir}/memcached/*
  
  %changelog
 +* Tue Aug  2 2011 Paul Lindner <lindner at inuus.com> - 0:1.4.6-1
 +- Upgrade to memcached-1.4.6
 +
+ * Wed Feb 16 2011 Joe Orton <jorton at redhat.com> - 0:1.4.5-7
+ - fix build
+ 
  * Mon Feb 14 2011 Paul Lindner <lindner at inuus.com> - 0:1.4.5-6
  - Rebuild for updated libevent