[network-manager-applet/nma-1-2: 4/4] merge: branch 'bg/mm-device-race-bgo776384'

[Beniamino Galvani <bgalvani src gnome org>]

commit 0eb16c742628a01668d5bded3cd9c6b1f45a3808
Merge: aeb7717 1ff170c
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Fri Jan 6 10:24:19 2017 +0100

    merge: branch 'bg/mm-device-race-bgo776384'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776384
    
    (cherry picked from commit ec1a47c29b137daa96beac4b87b9a80eeca776a7)

 src/applet-device-broadband.c |   15 ++++++++++-----
 src/applet.c                  |   20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)
---