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

[David Woodhouse]

commit 4c4a4316d33e80035498901e84ea07945c1e5b31
Merge: 2155887 b5ce81c
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Thu Jun 28 16:00:10 2012 +0100

    Merge ../master into el5

 .gitignore       |    1 +
 openconnect.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---