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

[David Woodhouse]

commit 0a640080454975bbbf76bc76d0e440780c12fa3f
Merge: dbdb52f 3cf6226
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Thu May 17 13:57:04 2012 +0100

    Merge ../master into f17

---