Imported Debian patch 0.9.10.0-2
Start of backport to wheezy
* Added entry in changelog
Merge branch 'upstream' of https://github.com/abferm/network-manager into upstream