Merge branch 'master' of git://repo.or.cz/cnetworkmanager
treea161a4d684375a3ea3a528da0d9c139e701bcdda
-rw-r--r-- 829 NEWS
-rwxr-xr-x 43841 cnetworkmanager