[NetworkManager-openconnect/f17: 2/2] Merge ../master into f17

[David Woodhouse]

commit 475e820c2764b09615920e9e440987eceedca395
Merge: 617c46c e686020
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Thu May 17 20:50:57 2012 +0100

    Merge ../master into f17

 NetworkManager-openconnect.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---