[openconnect/el5: 3/3] Merge ../master into el5

[David Woodhouse]

commit 2155887758ff9a27203ab80601d89b6b6b55c385
Merge: 0aaee52 3aff832
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Thu Jun 28 13:57:15 2012 +0100

    Merge ../master into el5
    
    Conflicts:
    	openconnect.spec

 .gitignore                                         |    1 +
 ...re-zlib-in-pkgconfig-if-it-was-found-with.patch |   45 --------------------
 openconnect.spec                                   |    9 ++--
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 50 deletions(-)
---
diff --cc openconnect.spec
index 719b65d,db3f00c..9399147
--- a/openconnect.spec
+++ b/openconnect.spec
@@@ -150,9 -147,9 +148,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/pkgconfig/openconnect.pc
  
  %changelog
+ * Thu Jun 27 2012 David Woodhouse <David.Woodhouse at intel.com> - 4.01-1
+ - Update to 4.01 release
+ 
 +* Thu Jun 21 2012 David Woodhouse <David.Woodhouse at intel.com> - 4.00-3
 +- Remove zlib from openconnect.pc dependencies
 +
  * Thu Jun 21 2012 David Woodhouse <David.Woodhouse at intel.com> - 4.00-2
  - Fix dependencies for RHEL[56]