Merge ~morphis/snappy-hwe-snaps/+git/network-manager:nm-revert-dhcp-lease-storage into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Switch back to store DHCP leases in SNAP_DATA

This depends on https://code.launchpad.net/~morphis/snappy-hwe-snaps/+git/network-manager/+merge/309843

Unmerged commits

45a67e2... by Simon Fels on 2016-11-02

[SNAPPY] Move dhcp lease into a subdirectory of our state dir

9dbee76... by Simon Fels on 2016-11-02

Revert "[SNAPPY] Write DHCP lease files to /run/NetworkManager/dhcp/"

This reverts commit 2331dd5f46178b6bb6d0ea3bf8cfb953feeb74d3.

1edfb12... by Simon Fels on 2016-11-02

Revert "Add a comment explaining why we're setting the lease file directory"

This reverts commit 275d12ba0f70753f3258dda8298609ef95974cff.

3d64af5... by Simon Fels on 2016-10-07

[SNAPPY] Set correct path for secret_key on write attempt too

98b73a2... by System Enablement CI Bot <email address hidden> on 2016-10-04

Merge remote tracking branch dhcp-leases-run

Merge-Proposal: https://code.launchpad.net/~ssweeny/snappy-hwe-snaps/+git/network-manager/+merge/307371

275d12b... by Scott Sweeny on 2016-10-04

Add a comment explaining why we're setting the lease file directory

2331dd5... by Scott Sweeny on 2016-09-30

[SNAPPY] Write DHCP lease files to /run/NetworkManager/dhcp/

25a2614... by System Enablement CI Bot <email address hidden> on 2016-09-28

Merge remote tracking branch xenial-add-netplan-support

Merge-Proposal: https://code.launchpad.net/~morphis/snappy-hwe-snaps/+git/network-manager/+merge/306487

b91fb1f... by System Enablement CI Bot <email address hidden> on 2016-09-28

Merge remote tracking branch fix-secret-key-name

Merge-Proposal: https://code.launchpad.net/~awe/snappy-hwe-snaps/+git/network-manager/+merge/306922

3b6273f... by Martin Pitt on 2016-09-22

[SNAPPY] Add support for reading netplan's connection files

Origin: https://git.launchpad.net/network-manager/tree/debian/patches/Read-system-connections-from-run.patch
Bug-Ubuntu: https://launchpad.net/bugs/1594551

diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 0000000..83bc72e
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,1068 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://translationproject.org/', in the "Teams" area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `[e-mail]', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `[e-mail]' to
+reach the coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of November
+2007.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
+                        +----------------------------------------------------+
+     Compendium         |                      []       [] []        []      |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
+     ap-utils           |                                                    |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                                                 [] |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                                                    |
+     bison              |                               [] []                |
+     bison-runtime      |                                  []                |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                               [] []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    [] []       []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     dialog             |                                                    |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []     []      |
+     findutils          |                []                                  |
+     findutils_stable   |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                                    |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gcal               |                      []                            |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gip                |                []                                  |
+     gliv               |                []                []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                      [] []       () ()     []      |
+     gnuedu             |                                                    |
+     gnulib             |                []                                  |
+     gnunet             |                                                    |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                  []                |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
+     gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                                    |
+     gramadoir          | []                               []                |
+     grep               |                         []                      [] |
+     gretl              |                                  ()                |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins-bad    |                []             []                   |
+     gst-plugins-base   |                []             []                   |
+     gst-plugins-good   |                []    []       []                   |
+     gst-plugins-ugly   |                []             []                   |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |             []          []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     herrie             |                                  []                |
+     hylafax            |                                                    |
+     idutils            |                               [] []                |
+     indent             |                      [] []       []             [] |
+     iso_15924          |                                                    |
+     iso_3166           |       []    [] [] [] [] [] [] [] [] []          [] |
+     iso_3166_2         |                                                    |
+     iso_4217           |                         []    [] []                |
+     iso_639            |                         []    [] []             [] |
+     jpilot             |                         []                         |
+     jtag               |                                                    |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                      []          []                |
+     keytouch-editor    |                                  []                |
+     keytouch-keyboa... |                      []                            |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] []                |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                         []    []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
+     lingoteach         |                                                    |
+     lprng              |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailfromd          |                                                    |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      []       [] []                |
+     minicom            |                         []    [] []                |
+     nano               |                []    []          []                |
+     opcodes            |                                  []                |
+     parted             |                         []       []                |
+     pilot-qof          |                                                    |
+     popt               |                         []    [] []                |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                               []                   |
+     screem             |                                                    |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     shared-mime-info   |                []    [] []    [] () []     []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     skencil            |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                []                |
+     texinfo            |                               [] []             [] |
+     tin                |                                  ()        ()      |
+     tuxpaint           | []             []             [] []        []   [] |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] []    [] []                |
+     util-linux-ng      |                      [] []    [] []                |
+     vorbis-tools       |                         []                         |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      [] []       []                |
+     xchat              |             [] []    [] []       [] []     []      |
+     xkeyboard-config   |                []                                  |
+     xpad               |                []             []           []      |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                           6  0  2  1  8 26  2 40 48  2 56 88 15  1  15   18
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     Compendium         | []          [] []  []                []          |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []                                               |
+     bfd                | []          []                                   |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     dialog             |       []           []                         [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     fetchmail          | []                                               |
+     findutils          |    []              []                []          |
+     findutils_stable   |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                                                  |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                () |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []          [] []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []    []       []                             [] |
+     gip                | []    []       []  []                            |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnuedu             | []                                               |
+     gnulib             | [] []              []                            |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []          [] []  []                   []       |
+     gpsdrive           |    []                                            |
+     gramadoir          |                []  []                            |
+     grep               | []          []     []                            |
+     gretl              | []    []       []                             () |
+     gsasl              |                    []                   []       |
+     gss                |                []  []                            |
+     gst-plugins-bad    | []          []                       []       [] |
+     gst-plugins-base   | []          []                       []       [] |
+     gst-plugins-good   | []    []    []                       []       [] |
+     gst-plugins-ugly   | []          []                       []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |             []     []                         [] |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                []       [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     herrie             |                    []                            |
+     hylafax            |                                                  |
+     idutils            |                []  []                [] []    [] |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_15924          |                []                                |
+     iso_3166           | [] [] []    [] []     [] [] [] [] [] [] []    [] |
+     iso_3166_2         |                []                                |
+     iso_4217           | [] []       [] []                    []       [] |
+     iso_639            | []       [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                []  []                         [] |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                         [] |
+     latrine            |                    []                         [] |
+     ld                 | []          [] []  []                            |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                []                                |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []       []     []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           | []          [] []                                |
+     lingoteach         |                []                       []    [] |
+     lprng              |                                                  |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailfromd          |                                                  |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             |                                               [] |
+     minicom            | []          [] []                    []          |
+     nano               | []    []       []  [] []             []       [] |
+     opcodes            | []          [] []  []                            |
+     parted             |                []                       []    [] |
+     pilot-qof          |                                                  |
+     popt               |                []  [] []                   []    |
+     psmisc             |                                      []       [] |
+     pwdutils           |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                []                                |
+     skencil            | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     system-tools-ba... | []    []    [] []  []             [] [] []    [] |
+     tar                |    [] []    []     []                []          |
+     texinfo            |                []           []       []          |
+     tin                |    []          ()                                |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     util-linux-ng      | [] []       [] []                    [] []    [] |
+     vorbis-tools       |                                                  |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []          [] []        []    []    []       [] |
+     xkeyboard-config   | []          [] []                    []          |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          85 22 14  2 48 101 61 12  2  8  2  6 53 29  1 52
+
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                        +--------------------------------------------------+
+     Compendium         |                                           []     |
+     a2ps               |       ()                      []          []     |
+     aegis              |                                           ()     |
+     ant-phone          |                                           []     |
+     anubis             |                               []    []    []     |
+     ap-utils           |                               []                 |
+     aspell             |                            []             []     |
+     bash               |                                           []     |
+     bfd                |                                                  |
+     bibshelf           |                               []                 |
+     binutils           |                                                  |
+     bison              |                               []    []    []     |
+     bison-runtime      |                               []    []    []     |
+     bluez-pin          |          []                   []          []     |
+     cflow              |                                                  |
+     clisp              |                                           []     |
+     console-tools      |                                                  |
+     coreutils          |                                           []     |
+     cpio               |                                           []     |
+     cpplib             |                                           []     |
+     cryptonit          |                                           []     |
+     dialog             |                               []          []     |
+     diffutils          | []                            []          []     |
+     doodle             |                                                  |
+     e2fsprogs          |                                           []     |
+     enscript           |                                           []     |
+     fetchmail          | []                                        []     |
+     findutils          |                                           []     |
+     findutils_stable   |                                           []     |
+     flex               |       []                                  []     |
+     fslint             |                                                  |
+     gas                |                                                  |
+     gawk               | []                                        []     |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | []                            []          []     |
+     gettext-runtime    | []    []                                  []     |
+     gettext-tools      | []    []                                         |
+     gip                |                               []          []     |
+     gliv               |                                           []     |
+     glunarclock        |                               []          []     |
+     gmult              | []                            []          []     |
+     gnubiff            |                                                  |
+     gnucash            | ()                                  () ()        |
+     gnuedu             |                                                  |
+     gnulib             | []                                        []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                               []                 |
+     gpe-aerial         |                                           []     |
+     gpe-beam           |                                           []     |
+     gpe-calendar       | []                                               |
+     gpe-clock          | []    []                                  []     |
+     gpe-conf           | []    []                                  []     |
+     gpe-contacts       |       []                                         |
+     gpe-edit           | []    []                                  []     |
+     gpe-filemanager    | []    []                                         |
+     gpe-go             | []    []                                  []     |
+     gpe-login          | []    []                                  []     |
+     gpe-ownerinfo      | []                                        []     |
+     gpe-package        | []    []                                         |
+     gpe-sketchbook     |       []                                  []     |
+     gpe-su             | []    []                                  []     |
+     gpe-taskmanager    | []    [] []                               []     |
+     gpe-timesheet      |                                           []     |
+     gpe-today          | []                                        []     |
+     gpe-todo           | []                                               |
+     gphoto2            | []                                        []     |
+     gprof              |                               []                 |
+     gpsdrive           |                                           []     |
+     gramadoir          |                                           ()     |
+     grep               |             []                            []     |
+     gretl              |                                                  |
+     gsasl              |                                           []     |
+     gss                |                                                  |
+     gst-plugins-bad    |                                           []     |
+     gst-plugins-base   |                                           []     |
+     gst-plugins-good   |                                           []     |
+     gst-plugins-ugly   |                                           []     |
+     gstreamer          |                                           []     |
+     gtick              |                                           []     |
+     gtkam              | []                                        []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |                            []             []     |
+     gutenprint         |                                           []     |
+     hello              | [] [] []                      []    []    []  [] |
+     herrie             |                                           []     |
+     hylafax            |                                                  |
+     idutils            |                                           []     |
+     indent             | []                                        []     |
+     iso_15924          |                                           []     |
+     iso_3166           | []    [] []       []    []          []    []  [] |
+     iso_3166_2         |                                           []     |
+     iso_4217           | []                []                      []     |
+     iso_639            | []                []                      []  [] |
+     jpilot             | ()                                        ()     |
+     jtag               |                                                  |
+     jwhois             |                                           []     |
+     kbd                |                                           []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                                  |
+     latrine            |                                           []     |
+     ld                 |                                                  |
+     leafpad            | []                []                             |
+     libc               | []    []                                  []     |
+     libexif            |                                                  |
+     libextractor       |                                                  |
+     libgpewidget       |                                           []     |
+     libgpg-error       |                                                  |
+     libgphoto2         | []                                               |
+     libgphoto2_port    | []                                               |
+     libgsasl           |                                           []     |
+     libiconv           |                                           []     |
+     libidn             | []                                        []     |
+     lifelines          |                                           []     |
+     lilypond           |                                           []     |
+     lingoteach         |                                           []     |
+     lprng              |                                                  |
+     lynx               | []                                        []     |
+     m4                 | []                                        []     |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               | []    []                                  []     |
+     man-db             |                                                  |
+     minicom            | []                                               |
+     nano               |                               []    []    []     |
+     opcodes            |                                           []     |
+     parted             | []                                        []     |
+     pilot-qof          |                                                  |
+     popt               | []    []                                  []     |
+     psmisc             | []                                  []    []     |
+     pwdutils           |                                                  |
+     qof                |                                                  |
+     radius             |                                                  |
+     recode             |                                           []     |
+     rpm                | []    []                                         |
+     screem             | []                                               |
+     scrollkeeper       |                                     [] [] []  [] |
+     sed                | []                                        []     |
+     shared-mime-info   | []    []          []          []    []    []  [] |
+     sharutils          | []                                        []     |
+     shishi             |                                                  |
+     skencil            |                                                  |
+     solfege            |                                     ()        () |
+     soundtracker       |                                                  |
+     sp                 | ()                                               |
+     system-tools-ba... | []    []          []                      []     |
+     tar                | []          []                            []     |
+     texinfo            |                                     []    []     |
+     tin                |                                                  |
+     tuxpaint           |                                     ()    []  [] |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | []                                        []     |
+     util-linux-ng      | []                                        []     |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                           []     |
+     wdiff              |                               []    []           |
+     wget               | []                                        []     |
+     xchat              | []    []                []                []     |
+     xkeyboard-config   |    [] []                                  []     |
+     xpad               |       []                      []          []     |
+                        +--------------------------------------------------+
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                          51  2 25  3  2  0  6  0  2  2 20  0 11  1 103  6
+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +--------------------------------------------------+
+     Compendium         |          []  []      []       []          []     |
+     a2ps               |       ()     []      [] []       []    [] []     |
+     aegis              |                      () ()                       |
+     ant-phone          |                      []                   []     |
+     anubis             |       []             [] []                       |
+     ap-utils           |       ()                                         |
+     aspell             |                      [] []    []                 |
+     bash               |       []                      []                 |
+     bfd                |                                                  |
+     bibshelf           |                                           []     |
+     binutils           |                         []    []                 |
+     bison              |       []     []      [] []                []     |
+     bison-runtime      |       []     []      []          []       []     |
+     bluez-pin          |       []     []   [] [] []    [] []    [] []     |
+     cflow              |       []                                         |
+     clisp              |                         []                       |
+     console-tools      |                         []                       |
+     coreutils          |       []                []       []       []     |
+     cpio               |       []                []                []     |
+     cpplib             |                                           []     |
+     cryptonit          |              []                           []     |
+     dialog             |                                           []     |
+     diffutils          |       []     []      [] []             [] []     |
+     doodle             |                                     []    []     |
+     e2fsprogs          |       []                                  []     |
+     enscript           |              []      [] []       []       []     |
+     fetchmail          |       []                []          []           |
+     findutils          |       [] []                               []     |
+     findutils_stable   |       [] []          []       [] []       []     |
+     flex               |       []     []      [] []                []     |
+     fslint             |                                           []     |
+     gas                |                                                  |
+     gawk               |       []     []      []                   []     |
+     gcal               |                                           []     |
+     gcc                |                                        [] []     |
+     gettext-examples   |       [] []          [] []    [] []    [] []     |
+     gettext-runtime    |       [] []          [] []    [] []    [] []     |
+     gettext-tools      |       []             [] []    [] []    [] []     |
+     gip                |                   []          []       [] []     |
+     gliv               |       []     []      [] []    []          []     |
+     glunarclock        |              []      [] []    []       [] []     |
+     gmult              |                   [] []                [] []     |
+     gnubiff            |                      ()                   []     |
+     gnucash            |       ()                                  []     |
+     gnuedu             |                                                  |
+     gnulib             |       []                         []       []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                           []     |
+     gnutls             |       []                                  []     |
+     gpe-aerial         |          []  []      [] []       []    [] []     |
+     gpe-beam           |          []  []      [] []       []    [] []     |
+     gpe-calendar       |                         []       []    [] []     |
+     gpe-clock          |          []  []      [] []    [] []    [] []     |
+     gpe-conf           |          []  []      [] []    [] []       []     |
+     gpe-contacts       |                      [] []       []    [] []     |
+     gpe-edit           |       [] []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                  []       []     |
+     gpe-go             |       []     []      [] []    [] []    [] []     |
+     gpe-login          |          []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |          []  []      [] []    [] []    [] []     |
+     gpe-package        |                                  []       []     |
+     gpe-sketchbook     |          []  []      [] []    [] []    [] []     |
+     gpe-su             |          []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |          []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |          []  []      [] []    [] []    [] []     |
+     gpe-today          |          []  []      [] []    [] []    [] []     |
+     gpe-todo           |                         []       []    [] []     |
+     gphoto2            |    [] []             []       []       [] []     |
+     gprof              |              []      []                   []     |
+     gpsdrive           |                         []                []     |
+     gramadoir          |                               []          []     |
+     grep               |       []                      [] []       []     |
+     gretl              |       [] []  []                                  |
+     gsasl              |       []                               [] []     |
+     gss                |       []             []       []          []     |
+     gst-plugins-bad    |       []     []                           []     |
+     gst-plugins-base   |       []                                  []     |
+     gst-plugins-good   |       []                                  []     |
+     gst-plugins-ugly   |       []     []                           []     |
+     gstreamer          |       []                            [] [] []     |
+     gtick              |                         []                       |
+     gtkam              |    [] []     []         []                []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |              []   [] [] []    [] []    [] []     |
+     gutenprint         |                                           []     |
+     hello              |       []     []      [] []    [] []    [] []     |
+     herrie             |       []                []                []     |
+     hylafax            |                                                  |
+     idutils            |       []     []      [] []                []     |
+     indent             |       []     []      [] []    []       [] []     |
+     iso_15924          |                                                  |
+     iso_3166           |    [] [] []  []      [] [] [] [] [] [] [] []  [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |       [] []             [] []    []    [] []     |
+     iso_639            |       []                [] [] [] []    [] []     |
+     jpilot             |                                                  |
+     jtag               |                               []                 |
+     jwhois             |       []     []      []                   []     |
+     kbd                |       []             []                   []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                           []     |
+     latrine            |                                                  |
+     ld                 |                                           []     |
+     leafpad            |       [] []             []    []          []  [] |
+     libc               |       []                []    []          []     |
+     libexif            |       []                      []                 |
+     libextractor       |                      []                   []     |
+     libgpewidget       |       [] []  []      []       [] []    [] []     |
+     libgpg-error       |       []             []                   []     |
+     libgphoto2         |       []                                         |
+     libgphoto2_port    |       []                []                []     |
+     libgsasl           |       []             []                [] []     |
+     libiconv           |                                  []    [] []     |
+     libidn             |       []                               [] ()     |
+     lifelines          |       []                                  []     |
+     lilypond           |                                                  |
+     lingoteach         |              []                                  |
+     lprng              |       []                                         |
+     lynx               |              []         []                []     |
+     m4                 |       []     []      [] []                []     |
+     mailfromd          |       []                                         |
+     mailutils          |       []                []                []     |
+     make               |       []     []         []                []     |
+     man-db             |       []             [] []                []     |
+     minicom            |       []     []      [] []                []     |
+     nano               |              []      [] []                []     |
+     opcodes            |                      []                   []     |
+     parted             |       []                                         |
+     pilot-qof          |                                                  |
+     popt               |       [] []             []                []     |
+     psmisc             |       []                                  []     |
+     pwdutils           |       []                                  []     |
+     qof                |              []                           []     |
+     radius             |       []                []                       |
+     recode             |       [] []  []      [] []       []       []     |
+     rpm                |       [] []             []                []     |
+     screem             |                                                  |
+     scrollkeeper       |       []             [] []    []    [] [] []     |
+     sed                |       [] []  []      [] []    [] []    [] []     |
+     shared-mime-info   |       [] []  []                     [] [] []     |
+     sharutils          |       []                []             [] []     |
+     shishi             |       []                                         |
+     skencil            |          []  []                           []     |
+     solfege            |              []                                  |
+     soundtracker       |                               []          []     |
+     sp                 |                                                  |
+     system-tools-ba... |    [] [] []  []      []             [] [] []  [] |
+     tar                |       []                []       []       []     |
+     texinfo            |       []             [] []                []     |
+     tin                |                         ()                       |
+     tuxpaint           |       [] []                      [] [] [] []     |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         |              []         []       []       []     |
+     util-linux-ng      |              []         []       []       []     |
+     vorbis-tools       |                         []                       |
+     wastesedge         |                                                  |
+     wdiff              |       []     []      [] []    [] []       []     |
+     wget               |          []             []    []          []     |
+     xchat              |    []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                               [] []       []     |
+     xpad               |                               [] []       []     |
+                        +--------------------------------------------------+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0  5 77 31  53    4 58 72  3 45 46  9 45 122  3
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     Compendium         |          []        []         []          []      | 19
+     a2ps               |          [] []     []                             | 19
+     aegis              |                    []                             |  1
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 16
+     bash               |          []                                       |  6
+     bfd                |                                                   |  2
+     bibshelf           |                    []                             |  7
+     binutils           |          [] []     []                     []      |  9
+     bison              |          [] []     []                     []      | 20
+     bison-runtime      |             []     []         []          []      | 18
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  9
+     console-tools      |          []        []                             |  5
+     coreutils          |          [] []     []                             | 18
+     cpio               |          [] []     []         []                  | 11
+     cpplib             |          [] []     []         []          []      | 12
+     cryptonit          |                    []                             |  6
+     dialog             |                    []  []     []                  |  9
+     diffutils          |          [] []     []         []          []      | 29
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     fetchmail          |          []        []                             | 12
+     findutils          |          [] []     []                             | 11
+     findutils_stable   |          [] []     []                     []      | 18
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  2
+     gas                |          []                                       |  3
+     gawk               |          []        []         []                  | 16
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  7
+     gettext-examples   |          [] []     []         []    []    []      | 29
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 20
+     gip                |                    []                     []      | 13
+     gliv               |          []        []                             | 11
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 16
+     gnubiff            |                    []                             |  2
+     gnucash            |          () []                                    |  5
+     gnuedu             |                    []                             |  2
+     gnulib             |                    []                             | 10
+     gnunet             |                                                   |  0
+     gnunet-gtk         |          []        []                             |  3
+     gnutls             |                                                   |  4
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []  []                         |  7
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []  []     []                  | 16
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []     []          []      | 22
+     gpe-filemanager    |                    []  []                         |  7
+     gpe-go             |          []        []  []     []                  | 19
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []  []     []                  | 21
+     gpe-taskmanager    |          []        []  []     []                  | 21
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []  []                         |  8
+     gphoto2            |             []     []         []          []      | 21
+     gprof              |          []        []                             | 13
+     gpsdrive           |                    []                             |  5
+     gramadoir          |                    []                             |  7
+     grep               |                    []                             | 12
+     gretl              |                                                   |  6
+     gsasl              |                    []         []          []      |  9
+     gss                |                    []                             |  7
+     gst-plugins-bad    |             []     []         []                  | 13
+     gst-plugins-base   |             []     []                             | 11
+     gst-plugins-good   |             []     []         []    []    []      | 16
+     gst-plugins-ugly   |             []     []         []                  | 13
+     gstreamer          |          [] []     []                             | 18
+     gtick              |             []     []                             |  7
+     gtkam              |                    []                             | 16
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 27
+     gutenprint         |                                                   |  4
+     hello              |          [] []     []         []          []      | 38
+     herrie             |          []        []                             |  8
+     hylafax            |                                                   |  0
+     idutils            |          []        []                             | 15
+     indent             |          [] []     []         []          []      | 28
+     iso_15924          |                    []         []                  |  4
+     iso_3166           |    [] [] [] []     []  []     []    []    []      | 54
+     iso_3166_2         |                    []         []                  |  4
+     iso_4217           |    []    []        []         []    []            | 24
+     iso_639            |             []     []  []     []    []            | 26
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          [] []     []                             | 13
+     keytouch           |                    []                             |  8
+     keytouch-editor    |                    []                             |  5
+     keytouch-keyboa... |                    []                             |  5
+     latrine            |          []        []                             |  5
+     ld                 |          []        []         []          []      | 10
+     leafpad            |          [] []     []         []          []      | 24
+     libc               |          []                   []          []      | 19
+     libexif            |                    []                             |  5
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 20
+     libgpg-error       |                    []                             |  6
+     libgphoto2         |             []     []                             |  9
+     libgphoto2_port    |             []     []                     []      | 11
+     libgsasl           |                    []                             |  8
+     libiconv           |                    []  []                         | 11
+     libidn             |                    []         []                  | 11
+     lifelines          |                                                   |  4
+     lilypond           |                    []                             |  6
+     lingoteach         |                    []                             |  6
+     lprng              |                    []                             |  2
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailfromd          |             []     []                             |  3
+     mailutils          |             []     []                             |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  9
+     minicom            |                    []                             | 14
+     nano               |                    []         []          []      | 20
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      | 11
+     pilot-qof          |                    []                             |  1
+     popt               |          []        []         []          []      | 18
+     psmisc             |                    []         []                  | 10
+     pwdutils           |                    []                             |  3
+     qof                |                    []                             |  4
+     radius             |             []     []                             |  7
+     recode             |          []        []         []                  | 25
+     rpm                |          [] []     []                     []      | 13
+     screem             |                    []                             |  2
+     scrollkeeper       |          [] []     []                     []      | 26
+     sed                |          []        []         []          []      | 23
+     shared-mime-info   |             []     []         []                  | 29
+     sharutils          |          []        []                     []      | 23
+     shishi             |                    []                             |  3
+     skencil            |                    []                             |  7
+     solfege            |                    []                             |  3
+     soundtracker       |          []        []                             |  9
+     sp                 |          []                                       |  3
+     system-tools-ba... |    []    [] []     []     []  []          []      | 38
+     tar                |          [] []     []                             | 17
+     texinfo            |          []        []         []                  | 15
+     tin                |                                                   |  1
+     tuxpaint           |                    []  []                 []      | 19
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux         |          [] []     []                             | 20
+     util-linux-ng      |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             |  4
+     wastesedge         |                                                   |  1
+     wdiff              |          []        []                             | 23
+     wget               |          []        []                     []      | 20
+     xchat              |             []     []         []          []      | 29
+     xkeyboard-config   |          [] []     []                             | 14
+     xpad               |                    []         []          []      | 15
+                        +---------------------------------------------------+
+       76 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      163 domains          0  3  1 74 51  0  143 21  1  57     7    45    0  2036
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If November 2007 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites.  The most
+up-to-date matrix with full percentage details can be found at
+`http://translationproject.org/extra/matrix.html'.
+
+1.6 Using `gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`[e-mail]' to make the `.pot' files available
+to the translation teams.
+
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..bf4f84d
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+The NetworkManager Team <[e-mail]>
diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..d3ea0ce
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,38 @@
+Guidelines for Contributing:
+
+1) Platform-specific functionality (for example, location of binaries that
+NetworkManager calls, or functionality used only on some platforms or
+distribution, like resolvconf) should be configurable at build time, with the
+normal autoconf mechanisms for putting a #define in config.h (AC_DEFINE), then
+with #ifdef MY_DEFINE / #endif in the code.
+
+2) Coding standards are generally GNOME coding standards, with these exceptions:
+	a) 4 space tabs  (_not_ 8-space tabs)
+	b) REAL tabs (_not_ a mix of tabs and spaces in the initial indent)
+	c) spaces used to align continuation lines past the indent point of the
+	   first statement line, like so:
+
+		if (some_really_really_long_variable_name &&
+		    another_really_really_long_variable_name) {
+			...
+		}
+
+* Keep a space between the function name and the opening '('.
+    GOOD: g_strdup (x)
+    BAD:  g_strdup(x)
+
+* C-style comments
+    GOOD: f(x);  /* comment */
+    BAD:  f(x);  // comment
+
+* Keep assignments in the variable declaration area pretty short.
+    GOOD: MyObject *object;
+    BAD: MyObject *object = complex_and_long_init_function(arg1, arg2, arg3);
+
+* 80-cols is a guideline, don't make the code uncomfortable in order to fit in
+  less than 80 cols.
+
+* Constants are CAPS_WITH_UNDERSCORES and use the preprocessor.
+    GOOD: #define MY_CONSTANT 42
+    BAD:  static const unsigned myConstant = 42;
+
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d14074f
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,351 @@
+Unless a COPYING file in a subdirectory or file-specific license headers
+specify a different license, the following applies to all files in this
+directory and all subdirectories.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
diff --git a/ChangeLog b/ChangeLog
index 7df3b16..be3111d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< ChangeLog
 2016-10-27 Simon Fels <[e-mail]>
 
  * Allow people to get ethernet managed back by NetworkManager
@@ -33,3 +34,22192 @@
  * Disable certain features we don't need and remove unwanted things from the snap
  * Update config parameters
  * Change --log-level to INFO (LP: #1602439)
+=======
[phone]  Dan Williams  <[e-mail]>
+
+	* Move NetworkManager to git.freedesktop.org
+		- git clone git://git.freedesktop.org/git/NetworkManager/NetworkManager.git
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-ip4-config.c
+	  libnm-util/nm-setting-ip4-config.h
+		- Add 'never-default' property, which when true indicates that a
+			connection should never be the default connection
+
+	* src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+		- (nm_ip4_config_get_never_default, nm_ip4_config_set_never_default):
+			Add never-default helpers
+
+	* src/NetworkManagerUtils.c
+		- (nm_utils_merge_ip4_config): update never-default when merging the
+			IP4 setting to the IP4 config
+
+	* src/NetworkManagerSystem.c
+		- (nm_system_apply_ip4_config): if the connection is never-default,
+			don't add routes without a gateway
+
+	* src/NetworkManagerPolicy.c
+		- (get_best_device): don't let never-default connections be the best
+		- (update_routing_and_dns): handle never-default for VPN connections
+
+	* system-settings/plugins/ifcfg-rh/reader.c
+		- (make_ip4_setting): handle never-default by checking GATEWAYDEV
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/vpn-manager/nm-vpn-connection.c
+		- (plugin_state_changed): clear secrets before setting the connection
+			state to FAILED, since doing so may destroy the connection itself,
+			since the NMVPNService owning this NMVPNConnection will unref it
+			when the NMVPNConnection is failed or stopped
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Michael Biebl  <[e-mail]>
+
+	* libnm-glib/Makefile.am
+		- Bump libnm-glib revision to indicate new API
+		- Give libnm-util version info
+
+	* libnm-util/Makefile.am
+		- Bump libnm-util soname to indicate API/ABI break with 0.6
+
[phone]  Dan Williams  <[e-mail]>
+
+	* Release NetworkManager 0.7
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-settings.c
+	  libnm-glib/nm-settings.h
+		- (nm_exported_connection_delete): rename 'delete' to 'do_delete' to
+			avoid using C++ reserved keywords in headers
+
+	* libnm-glib/nm-dbus-connection.c
+	  system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+	  system-settings/plugins/ifcfg-suse/nm-suse-connection.c
+	  system-settings/plugins/ifupdown/nm-ifupdown-connection.c
+	  system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/src/nm-sysconfig-connection.c
+		- Change 'delete' to 'do_delete'
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-rh
+		- Rename 'ifcfg-fedora' to 'ifcfg-rh'; it's not just used on Fedora
+
+	* system-settings/src/main.c
+		- (load_plugins): transparently handle ifcfg-fedora as ifcfg-rh
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	Fix mishandling of netlink error floods (rh #459205, novell #443429, lp #284507)
+
+	* src/nm-netlink-monitor.c
+		- Remove bits for using a non-default GMainContext, which weren't used
+		- (nm_netlink_monitor_error_handler): don't leak the GError, and report
+			the actual error code
+
+	* src/NetworkManager.c
+		- (nm_error_monitoring_device_link_state): disconnect error handler when
+			an error flood occurs to avoid pegging the CPU
+
[phone]  Dan Williams  <[e-mail]>
+
+	* callouts/nm-dispatcher-action.c
+		- (construct_envp, nm_dispatcher_action): pass connection UUID to
+			scripts in the environment
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo  <[e-mail]>
+
+	* configure.in
+	  libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-8021x.c
+	  libnm-util/nm-setting-8021x.h
+		- Add configure-time option for the system CA path
+		- Add 'system-ca-certs' option to 802.1x setting, which directs
+			NetworkManager to use system CA certificates instead of any
+			connection-defined CA certificates
+
+	* src/supplicant-manager/nm-supplicant-config.c
+	  src/supplicant-manager/nm-supplicant-settings-verify.c
+		- Use system CA certificates if the connection says to do so
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-dbus-manager.c
+	  src/nm-dbus-manager.h
+		- (nm_dbus_manager_get_name_owner): return error
+
+	* src/nm-manager.c
+		- (impl_manager_activate_connection): perform additional validation on
+			ActivateConnection calls of user connections
+		- (is_user_request_authorized): ensure that the requestor is the same
+			UID as the UID that owns the user settings service; users shouldn't
+			be able to control another user's connections
+
[phone]  Dan Williams  <[e-mail]>
+
+	* gfilemonitor/inotify-sub.c
+		- (dup_dirname): actually remove trailing '/' (bgo #561807)
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings): Make suse
+	plugin compile again.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/nm-setting.c
+	  libnm-util/nm-setting.h
+		- (NMSettingValueIterFn): instead of just a gboolean for secrets, take
+			all the GParamSpec flags of the property
+
+	* system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/plugins/keyfile/reader.c
+	  system-settings/plugins/keyfile/writer.c
+		- Update for NMSettingValueIterFn change
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+		- More documentation updates
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+	  libnm-util/nm-utils-private.h
+	  libnm-util/nm-connection.c
+		- (nm_utils_register_value_transformations): make private, called
+			from NMConnection registration anyway
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/Makefile.am
+	  libnm-util/nm-utils-private.h
+		- New header for internal utils private functions
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+		- Document some functions
+		- (nm_utils_string_in_list, nm_utils_string_list_contains,
+		   nm_utils_string_slist_validate): un-export, only used within
+			libnm-util or of limited use in general, and very easy to
+			re-implement by apps if needed
+
+	* libnm-util/nm-setting-8021x.c
+	  libnm-util/nm-setting-wired.c
+	  libnm-util/nm-setting-wireless-security.c
+	  libnm-util/nm-setting-wireless.c
+		- Update for private nm_utils_string_* functions
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting.c
+	  libnm-util/nm-setting.h
+		- Add NMSetting errors
+		- (nm_setting_update_secrets): return errors
+
+	* libnm-util/nm-connection.c
+	  libnm-util/nm-connection.h
+		- (nm_connection_update_secrets): return errors
+
+	* libnm-util/nm-setting-vpn.c
+	  src/nm-activation-request.c
+	  src/vpn-manager/nm-vpn-connection.c
+		- Handle update secrets errors
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting.c
+	  libnm-util/nm-setting.h
+	  libnm-util/libnm-util.ver
+		- (nm_setting_new_from_hash): rename from nm_setting_from_hash() to be
+			consistent with nm_connection_new_from_hash()
+
+	* src/nm-activation-request.c
+	  libnm-util/nm-connection.c
+		- Handle rename
+
[phone]  Dan Williams  <[e-mail]>
+
+	* configure.in
+	  Makefile.am
+	  docs/libnm-util/Makefile.am
+	  docs/libnm-util/libnm-util.types
+		- Start to document libnm-util
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-connection.h
+	  libnm-util/nm-connection.c
+		- Document public functions
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting.h
+	  libnm-util/nm-setting.c
+	  src/nm-device.c
+	  src/nm-manager.c
+	  system-settings/plugins/ifcfg-fedora/plugin.c
+		- Prefix compare flag defines with NM_SETTING_
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-connection.c
+	  libnm-util/nm-connection.h
+		- (nm_connection_replace_settings): take a GError
+
+	* libnm-glib/nm-settings.c
+	  libnm-glib/nm-dbus-connection.c
+	  src/nm-manager.c
+	  system-settings/plugins/ifcfg-suse/nm-suse-connection.c
+	  system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/plugins/keyfile/plugin.c
+		- Handle, or don't handle, errors from nm_connection_replace_settings()
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-connection.c
+		- (nm_setting_register, nm_setting_unregister): unexport; they are
+			private and don't have a use outside libnm-util
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-hso-gsm-device.c
+		- (real_connection_secrets_updated): handle PIN/PUK correctly for HSO
+			devices
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (read_mac_address): clean up
+		- (make_wireless_setting): pass NULL array to read_mac_address() like it
+			expects
+
+	* system-settings/plugins/ifcfg-fedora/plugin.c
+		- (read_one_connection): don't segfault on NULL errors
+
[phone]  Dan Williams  <[e-mail]>
+
+	* Tag 0.7.0-rc2
+
[phone]  Dan Williams  <[e-mail]>
+
+	Handle gateways on different subnets
+
+	* src/NetworkManagerSystem.c
+		- (add_ip4_route_to_gateway): gateway route should be link scope and
+			a host route
+		- (replace_default_ip4_route): use a destination address too; gateway
+			address should be /0; don't leak the gateway route object
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/libnm_glib.ver
+	  libnm-glib/nm-dbus-settings-system.c
+	  libnm-glib/nm-dbus-settings-system.h
+		- Add libnm-glib bits for CanModify
+
[phone]  Dan Williams  <[e-mail]>
+
+	* introspection/nm-settings-system.xml
+	  system-settings/src/dbus-settings.c
+	  system-settings/src/dbus-settings.h
+		- Add a "CanModify" property to indicate if any plugins support
+			connection modification
+
[phone]  Dan Williams  <[e-mail]>
+
+	Relicense libnm-glib to LGPLv2+ with agreement from contributors
+
[phone]  Dan Williams  <[e-mail]>
+
+	* vpn-manager/nm-vpn-connection.c
+		- (plugin_state_changed): clear VPN secrets on error to ensure they
+			are always requested from the settings service (rh #429287)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/crypto.c
+		- (crypto_get_private_key_data): fix bad initial arg type checking
+			from pkcs#12 patch
+
[phone]  Dan Williams  <[e-mail]>
+
+	Add support for PKCS#12 private keys (bgo #558982)
+
+	* libnm-util/crypto.c
+	  libnm-util/crypto.h
+		- (parse_old_openssl_key_file): rename from parse_key_file(); adapt to
+			take a GByteArray instead of a filename
+		- (file_to_g_byte_array): handle private key files too
+		- (decrypt_key): take a GByteArray rather than data + len
+		- (crypto_get_private_key_data): refactor crypto_get_private_key() into
+			one function that takes a filename, and one that takes raw data;
+			detect pkcs#12 files as well
+		- (crypto_load_and_verify_certificate): detect file type
+		- (crypto_is_pkcs12_data, crypto_is_pkcs12_file): add pkcs#12 detection
+			functions
+
+	* libnm-util/crypto_gnutls.c
+		- (crypto_decrypt): take GByteArray rather than data + len; fix a bug
+			whereby tail padding was incorrectly handled, leading to erroneous
+			successes when trying to decrypt the data
+		- (crypto_verify_cert): rework somewhat
+		- (crypto_verify_pkcs12): validate pkcs#12 keys
+
+	* libnm-util/crypto_nss.c
+		- (crypto_init): enable various pkcs#12 ciphers
+		- (crypto_decrypt): take a GByteArray rather than data + len
+		- (crypto_verify_cert): clean up
+		- (crypto_verify_pkcs12): validate pkcs#12 keys
+
+	* libnm-util/test-crypto.c
+		- Handle pkcs#12 keys
+
+	* libnm-util/nm-setting-8021x.c
+	  libnm-util/nm-setting-8021x.h
+	  libnm-util/libnm-util.ver
+		- Add two new properties, 'private-key-password' and
+			'phase2-private-key-password', to be used in conjunction with
+			pkcs#12 keys
+		- (nm_setting_802_1x_set_ca_cert_from_file,
+		   nm_setting_802_1x_set_client_cert_from_file,
+		   nm_setting_802_1x_set_phase2_ca_cert_from_file,
+		   nm_setting_802_1x_set_phase2_client_from_file): return certificate
+			type
+		- (nm_setting_802_1x_get_private_key_password,
+		   nm_setting_802_1x_get_phase2_private_key_password): return private
+			key passwords
+		- (nm_setting_802_1x_set_private_key_from_file,
+		   nm_setting_802_1x_set_phase2_private_key_from_file): set the private
+			key from a file, and update the private key password at the same time
+		- (nm_setting_802_1x_get_private_key_type,
+		   nm_setting_802_1x_get_phase2_private_key_type): return the private
+			key type
+
+	* src/supplicant-manager/nm-supplicant-settings-verify.c
+		- Whitelist private key passwords
+
+	* src/supplicant-manager/nm-supplicant-config.c
+		- (nm_supplicant_config_add_setting_8021x): for pkcs#12 private keys,
+			add the private key password to the supplicant config, but do not
+			add the client certificate (as required by wpa_supplicant)
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/plugins/keyfile/nm-keyfile-connection.c (copy_one_secret)
+	(add_secrets): Don't add empty secrets to the secrets hash table.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-wireless.c
+		- (nm_setting_wireless_get_seen_bssid): fix bug from accessor conversion
+			that cased this function to return garbage, breaking hidden AP
+			detection
+
[phone]  Dan Williams  <[e-mail]>
+
+	Fix deletion of VPN gateway route on DHCP renew (bgo #558133)
+
+	* src/NetworkManagerSystem.c
+	  src/NetworkManagerSystem.h
+		- (nm_system_device_set_ip4_route): return the route that was added
+		- (nm_system_add_ip4_vpn_gateway_route): make add_vpn_gateway_route()
+			public, clean up, and return the route that was added
+		- (nm_system_apply_ip4_config): remove VPN related stuff to simplify,
+			since nm_system_add_ip4_vpn_gateway_route() is now available; add
+			flags to allow only certain attributes of the NMIP4Config to be
+			applied
+
+	* src/nm-device.c
+		- (handle_dhcp_lease_change): don't touch the DHCP4 config on failure
+		- (nm_device_set_ip4_config): use nm_ip4_config_diff() to only apply
+			what's really changed between the old and new configs; don't export
+			the new IP4 config on failure; always send the DNS info to the
+			named manager
+
+	* src/vpn-manager/nm-vpn-connection.c
+		- (device_ip4_config_changed, nm_vpn_connection_new, dispose): track the
+			parent device's IP4Config and re-add the VPN gateway route when it
+			changes
+		- (nm_vpn_connection_ip4_config_get): add the VPN gateway route (since
+			nm_system_apply_ip4_config() no longer does) and cache it for later
+		- (connection_state_changed): move cleanup code to its own function
+		- (vpn_cleanup): delete any previously added VPN gateway route; and
+			re-apply the parent device's addresses and routes using
+			nm_system_apply_ip4_config(), not nm_device_set_ip4_config()
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+		- (nm_ip4_config_diff): new function; return the difference between two
+			IP4 configs
+		- (nm_ip4_config_compare): change into nm_ip4_config_diff
+
[phone]  Dan Williams  <[e-mail]>
+
+	* nm-ip4-config.c
+	  nm-ip4-config.h
+		- (nm_ip4_config_compare): compare two IP4 configs
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- (update_etc_hosts): only add newline if not the last line of the file
+			(Jonathan Miner)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/dhcp-manager/nm-dhcp-dhclient.c
+		- (get_leasefile_for_iface): move lease files back to where dhclient
+			puts them
+
[phone]  Michael Biebl  <[e-mail]>
+
+	* initscripts/Debian/NetworkManager
+		- Update to what Debian is actually using
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* libnm-util/nm-setting-8021x.c: Verify PEAP settings as well.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/src/main.c
+		- (add_default_dhcp_connection): make the fallback connection read-only
+
+	* libnm-glib/nm-settings.c
+	  libnm-glib/nm-settings.h
+		- Add detailed errors
+		- (impl_exported_connection_update, impl_exported_connection_delete):
+			return an error if the connection is read-only
+
+	* system-settings/plugins/ifupdown/nm-ifupdown-connection.c
+	  system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/src/main.c
+		- Use more detailed errors
+
+	* system-settings/src/nm-system-config-error.c
+	  system-settings/src/nm-system-config-error.h
+	  system-settings/src/dbus-settings.c
+		- Remove NM_SYSCONFIG_SETTINGS_ERROR_INVALID_CONNECTION, replaced by
+			NM_SETTINGS_ERROR_INVALID_CONNECTION
+
[phone]  Dan Williams  <[e-mail]>
+
+	* Add license headers to everything in src/
+
[phone]  Dan Williams  <[e-mail]>
+
+	* Tag 0.7.0-rc1
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerAP.c
+		- (nm_ap_new_fake_from_connection): treat only lack of a wireless security
+			setting as unencrypted; fixes a bug where NM wouldn't ask for new
+			secrets when connecting to an encrypted network failed
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-ip6-config.c
+	  libnm-util/nm-setting-ip6-config.h
+	  libnm-util/Makefile.am
+		- Make properties private and add accessor functions
+		- Hide IPv6 stuff from public API, it's incomplete and completely unused
+
+	* libnm-util/nm-connection.c
+	  libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+		- Ignore IPv6 stuff for now
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-8021x.c
+	  libnm-util/nm-setting-8021x.h
+		- Make properties private and add accessor functions
+
+	* src/supplicant-manager/nm-supplicant-config.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+		- Use 802.1x setting accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-wireless-security.c
+	  libnm-util/nm-setting-wireless-security.h
+		- Make properties private and add accessor functions
+
+	* libnm-util/nm-setting-wireless.c
+	  src/NetworkManagerAP.c
+	  src/nm-device-wifi.c
+	  src/supplicant-manager/nm-supplicant-config.c
+	  system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+		- Use wireless security accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-ethernet.c
+	  src/nm-device-wifi.c
+	  src/nm-device.c
+	  src/ppp-manager/nm-ppp-manager.c
+		- Harmonize return checking of ioctl
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (is_wireless_device): fall back to SIOCGIWNAME (rh #466340)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (nm_ppp_manager_start): if /dev/ppp doesn't exist, load the
+			ppp_generic module to create it (bgo #533064)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Alexander Sack <[e-mail]>
+
+	Fix "ppp connections don't honour ip4 connection settings"
+
+	* src/nm-device-ethernet.c
+		- (real_act_stage4_get_ip4_config): merge ip4config settings
+			with results from ppp manager
+
+	* src/nm-serial-device.c
+		- (real_act_stage4_get_ip4_config): merge ip4config settings
+			with results from ppp manager
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-ip4-config.c
+	  libnm-util/nm-setting-ip4-config.h
+		- Make properties private and add accessor functions
+
+	* callouts/nm-dispatcher-action.c
+	  libnm-glib/libnm-glib-test.c
+	  libnm-util/nm-utils.c
+	  src/NetworkManagerPolicy.c
+	  src/NetworkManagerSystem.c
+	  src/NetworkManagerUtils.c
+	  src/dhcp-manager/nm-dhcp-dhclient.c
+	  src/dhcp-manager/nm-dhcp-manager.c
+	  src/dnsmasq-manager/nm-dnsmasq-manager.c
+	  src/nm-device-wifi.c
+	  src/nm-device.c
+	  src/nm-hso-gsm-device.c
+	  src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+	  src/ppp-manager/nm-ppp-manager.c
+	  src/vpn-manager/nm-vpn-connection.c
+	  system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+	  system-settings/plugins/ifcfg-suse/plugin.c
+	  system-settings/plugins/ifupdown/parser.c
+	  test/nm-tool.c
+	  vpn-daemons/vpnc/properties/nm-vpnc.c
+		- Use IP4 accessor functions
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	Half of it by Dan Williams <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	libnm-util/nm-setting-vpn.c
+	libnm-util/nm-setting-vpn.h
+		- Make properties private and add accessor functions.
+
+	* src/vpn-manager/nm-vpn-connection.c
+	src/vpn-manager/nm-vpn-manager.c
+	system-settings/plugins/keyfile/reader.c
+	vpn-daemons/openvpn/properties/auth-helpers.c
+	vpn-daemons/openvpn/properties/import-export.c
+	vpn-daemons/openvpn/properties/nm-openvpn.c
+	vpn-daemons/openvpn/src/nm-openvpn-service.c
+	vpn-daemons/pptp/auth-dialog/main.c
+	vpn-daemons/pptp/properties/advanced-dialog.c
+	vpn-daemons/pptp/properties/nm-pptp.c
+	vpn-daemons/pptp/src/nm-pptp-service.c
+	vpn-daemons/vpnc/properties/nm-vpnc.c
+	vpn-daemons/vpnc/src/nm-vpnc-service.c
+		- Use VPN setting accessors.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-wireless.c
+	  libnm-util/nm-setting-wireless.h
+		- Make properties private and add accessor functions
+
+	* src/NetworkManagerAP.c
+	  src/nm-device-wifi.c
+	  src/nm-manager.c
+	  src/supplicant-manager/nm-supplicant-config.c
+	  system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c
+	  system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+	  system-settings/plugins/ifupdown/parser.c
+		- Use wireless setting accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-ppp.c
+	  libnm-util/nm-setting-ppp.h
+		- Make properties private and add accessor functions
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- Use ppp setting accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/nm-setting.h
+	  libnm-util/nm-setting.c
+		- Make properties private and add accessor functions
+
+	* libnm-util/nm-connection.c
+	  libnm-util/nm-setting-8021x.c
+	  libnm-util/nm-setting-cdma.c
+	  libnm-util/nm-setting-connection.c
+	  libnm-util/nm-setting-gsm.c
+	  libnm-util/nm-setting-ip4-config.c
+	  libnm-util/nm-setting-ip6-config.c
+	  libnm-util/nm-setting-ppp.c
+	  libnm-util/nm-setting-pppoe.c
+	  libnm-util/nm-setting-serial.c
+	  libnm-util/nm-setting-template.c
+	  libnm-util/nm-setting-vpn.c
+	  libnm-util/nm-setting-wired.c
+	  libnm-util/nm-setting-wireless-security.c
+	  libnm-util/nm-setting-wireless.c
+	  system-settings/plugins/keyfile/reader.c
+	  system-settings/plugins/keyfile/writer.c
+		- Use setting accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-connection.c
+	  libnm-util/nm-setting-connection.h
+		- Add a 'read-only' property that indicates the connection cannot be
+			modified
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+	  system-settings/plugins/ifupdown/parser.c
+		- These plugins are read-only at the moment
+
+	* system-settings/plugins/keyfile/reader.c
+	  system-settings/plugins/keyfile/writer.c
+		- Read-only shouldn't get saved out to files or read in from them
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/nm-device-ethernet.c (nm_device_ethernet_get_speed): Implement
+	correct speed reporting for fast devices (kernel >= 2.6.27).
+
[phone]  Dan Williams  <[e-mail]>
+
+	Attempt to compensate for modems that don't enable full AT parsing before
+	the PIN has been entered.
+
+	* src/nm-gsm-device.c
+		- (init_modem): accept different init strings
+		- (init_done): try different init strings on failure
+		- (check_pin_done): on PIN success, do full modem init
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-connection.c
+	  libnm-util/nm-setting-connection.h
+		- Make properties private and add accessor functions
+
+	* src/NetworkManagerPolicy.c
+	  src/nm-cdma-device.c
+	  src/nm-device-ethernet.c
+	  src/nm-device-interface.c
+	  src/nm-device-wifi.c
+	  src/nm-gsm-device.c
+	  src/nm-manager.c
+	  src/ppp-manager/nm-ppp-manager.c
+	  src/vpn-manager/nm-vpn-connection.c
+	  system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c
+	  system-settings/plugins/ifcfg-fedora/plugin.c
+	  system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+	  system-settings/plugins/ifupdown/parser.c
+	  system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/plugins/keyfile/plugin.c
+	  system-settings/plugins/keyfile/writer.c
+	  system-settings/src/main.c
+		- Use those accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-gsm.c
+	  libnm-util/nm-setting-gsm.h
+		- Make properties private and add accessor functions
+
+	* src/nm-gsm-device.c
+	  src/nm-hso-gsm-device.c
+	  src/ppp-manager/nm-ppp-manager.c
+		- Use those accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-cdma.c
+	  libnm-util/nm-setting-cdma.h
+		- Make properties private and add accessor functions
+
+	* src/nm-cdma-device.c
+	  src/ppp-manager/nm-ppp-manager.c
+		- Use those accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-pppoe.c
+	  libnm-util/nm-setting-pppoe.h
+		- Make properties private and add accessor functions
+
+	* src/nm-device-ethernet.c
+	  src/ppp-manager/nm-ppp-manager.c
+		- Use those accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-wired.c
+	  libnm-util/nm-setting-wired.h
+		- Make properties private and add accessor functions
+
+	* src/nm-device-ethernet.c
+	  system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+	  system-settings/src/main.c
+		- Use those accessors
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/libnm-util.ver
+	  libnm-util/nm-setting-serial.c
+	  libnm-util/nm-setting-serial.h
+	  src/nm-serial-device.c
+		- Make properties private and use accessors instead
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/supplicant-manager/nm-supplicant-interface.c
+	  src/supplicant-manager/nm-supplicant-interface.h
+	  src/supplicant-manager/nm-supplicant-manager.c
+	  src/supplicant-manager/nm-supplicant-manager.h
+		- Add state-to-string conversion functions
+
+	* src/nm-device-wifi.c
+	  src/nm-device-ethernet.c
+		- Normalize state info logging and use strings instead of numbers
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- (update_routing_and_dns): ignore host routes when determining whether
+			a VPN connection should own the default route (bgo #552594)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-gsm-device.c
+		- (set_apn): remove erroneous spaces in AT+CGDCONT command (Jerone Young)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (create_pppd_cmd_line): pppd always parses /etc/ppp/options, so always
+			add really important stuff to the command line to ensure that NM
+			overrides /etc/ppp/options (bgo #556781)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+	  src/nm-device.c
+		- Use the device's IP interface where appropriate (Per Hallsmark)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-gsm-device.c
+		- (schedule_automatic_registration_again): use a short timeout here
+			instead of an idle handler to avoid using too much CPU polling for
+			something we should be waiting a bit for anyway
+
[phone]  Dan Williams  <[e-mail]>
+
+	* include/NetworkManager.h
+	  introspection/nm-device.xml
+		- Add device state change reason for carrier changes
+
+	* src/nm-device-ethernet.c
+		- (set_carrier): use the carrier change reason when changing device
+			state in response to carrier changes
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- (update_etc_hosts): don't leak errors, and ensure that
+			g_file_set_contents() gets a valid error placeholder (rh #461933)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-manager.c
+		- (free_get_settings_info): don't use the DBusGProxy which could be
+			disposed of by the time the function is called
+		- (internal_new_connection_cb): save connection scope
+		- (connection_get_settings_cb): don't replace a connection unless it's
+			actually different from the existing one; fixes an issue where
+			killing the settings service wouldn't deactivate an active connection
+			provided by that settings service, because it was using a connection
+			that had already been replaced in the system or user hash
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManager.c
+		- (main): keep the DHCP manager around since it's a singleton; fixes
+			a use-after-free exposed by r4196 since the DHCP manager singleton
+			variable isn't cleared when the DHCP manager object is finalized
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-wireless-security.c
+		- (verify): accept 'none' as a pairwise cipher with Ad-Hoc WPA connections
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/supplicant-manager/nm-supplicant-config.c
+		- (ADD_STRING_LIST_VAL): don't add empty values to the supplicant config
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+		- (nm_dhcp_manager_get): fix mismatched refcount; creating the dhcp
+			manager object already refs it once
+		- (nm_dhcp_manager_cancel_transaction_real): clear freed variables that
+			also get cleaned up by nm_dhcp_device_destroy() to prevent
+			double-frees
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-manager.c
+		- (initial_get_connections): use private dbus manager, don't keep
+			ref-ing the singleton.  Fixes mismatched refcounts of the dbus
+			manager object.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-settings.c
+	  libnm-glib/nm-settings.h
+		- Rename the "get_secrets" virtual function "service_get_secrets" to
+			clarify when it's used; NMExportedConnetion is a base-class for both
+			the client and service side, which is sort of confusing, and
+			get_secrets only makes sense on the service side.
+
+	* libnm-glib/nm-dbus-connection.c
+		- (get_secrets): remove, unused, and clients need to do extra work to
+			get secrets anyway since the call can block on the remote side
+
+	* system-settings/plugins/ifupdown/nm-ifupdown-connection.c
+	  system-settings/plugins/keyfile/nm-keyfile-connection.c
+		- Fix up for get_secrets -> service_get_secrets
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-wifi.c
+		- (constructor): correctly determine encryption capabilities
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-wifi.c
+		- (wireless_qual_to_percent): fix quality calculation in a fallback case
+			(Johannes Berg)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+		- (ip4_dest_in_same_subnet): tighter checks on subnet matching,
+			if the ip4_dest is in a smaller subnet contained within a subnet
+			the machine is currently on, the destination is in the same subnet
+		- (nm_system_device_set_ip4_route): move subnet checks to callers
+		- (add_vpn_gateway_route): check if the VPN gateway is in the same
+			subnet as the parent device, and if so, don't add the direct
+			host route via the parent device's gateway (bgo #481620)
+		- (nm_system_apply_ip4_config): check whether the route to be added
+			is contained within a subnet the device is already on
+
[phone]  Dan Williams  <[e-mail]>
+
+	* include/NetworkManager.h
+	  introspection/nm-device.xml
+	  include/NetworkManagerVPN.h
+		- Add a few more state reasons for the device deactivated state
+
+	* src/nm-device-interface.c
+	  src/nm-device-interface.h
+		- (nm_device_interface_deactivate): add a 'reason' argument
+
+	* src/nm-device.c
+	  src/nm-device.h
+		- (nm_device_deactivate, nm_device_take_down): add a 'reason' argument
+		- (nm_device_state_changed): pass the state change reason to
+			nm_device_take_down()
+		- (nm_device_set_managed): take a 'reason' argument, and pass it along
+			to the state change function
+
+	* src/nm-manager.c
+	  src/nm-manager.h
+		- (remove_one_device, handle_unmanaged_devices, sync_devices,
+		   impl_manager_sleep): pass a reason code to nm_device_set_managed()
+		- (nm_manager_deactivate_connection): add a 'reason' argument and pass
+			something reasonable along to VPN deactivation
+
+	* src/vpn-manager/nm-vpn-manager.c
+	  src/vpn-manager/nm-vpn-manager.h
+		- (nm_vpn_manager_deactivate_connection): add a 'reason' argument and
+			pass that along to nm_vpn_connection_disconnect()
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-wifi.c
+		- (can_scan): remove old madwifi hack for not scanning while connected
+
[phone]  Dan Williams  <[e-mail]>
+
+	Add support for VPN subnet gateways (bgo #549196)
+
+	* include/NetworkManager.h
+		- Add key for internal VPN subnet gateway
+
+	* src/vpn-manager/nm-vpn-connection.c
+		- (ip_address_to_string): return a const from a static buffer so we
+			don't leak a lot of strings
+		- (print_vpn_config): print internal VPN gateway as well
+		- (nm_vpn_connection_ip4_config_get): grab internal VPN gateway from
+			VPN service too
+		- (nm_vpn_connection_get_ip4_internal_gateway): new function
+
+	* src/NetworkManagerSystem.c
+	  src/NetworkManagerSystem.h
+		- (nm_system_device_replace_default_ip4_route): split into two, one for
+			VPN connections and one for normal devices
+		- (replace_default_ip4_route): break out route stuff into its own function
+		- (nm_system_replace_default_ip4_route_vpn,
+		   nm_system_replace_default_ip4_route): simplify by having two cases,
+			one for VPNs and one for normal devices
+
+	* src/NetworkManagerPolicy.c
+		- (update_routing_and_dns): simplify, use split default route replacement
+			functions
+
[phone]  Dan Williams  <[e-mail]>
+
+	Rework default route handling to consolidate decisions in the policy,
+	and to take active VPN connections into account when changing the default
+	route (bgo #545912)
+
+	* src/NetworkManager.c
+		- (main): pass the vpn_manager to the policy so it knows about active
+			VPN connections; clean up the named manager which wasn't done before
+
+	* src/NetworkManagerPolicy.c
+	  src/NetworkManagerPolicy.h
+		- (nm_policy_new): get a clue about the vpn_manager
+		- (update_default_route): remove, fold into update_routing_and_dns()
+		- (update_routing_and_dns): handle active VPN connections too; an
+			active VPN connection becomes the default route if it does not have
+			server-specified or user-specified custom routes.  Otherwise, the
+			best active device gets the default route
+		- (vpn_connection_activated, vpn_connection_deactivated, nm_policy_new,
+		   nm_policy_destroy): track VPN connection activation and deactivation
+			and update the default route when appropriate
+
+	* src/NetworkManagerSystem.c
+	  src/NetworkManagerSystem.h
+		- (nm_system_vpn_device_unset_from_ip4_config): remove, put functionality
+			in the VPN connection itself
+		- (nm_system_vpn_device_set_from_ip4_config,
+		   nm_system_device_set_from_ip4_config): merge together to make
+			nm_system_apply_ip4_config()
+		- (add_vpn_gateway_route): add a route to the VPN's external gateway
+			via the parent device
+		- (nm_system_apply_ip4_config): simplify
+		- (add_ip4_route_to_gateway): new function; add a direct route to the
+			gateway if needed
+		- (nm_system_device_replace_default_ip4_route): simplify, break gateway
+			route stuff out into add_ip4_route_to_gateway() for clarity
+
+	* src/nm-device.c
+		- (nm_device_set_ip4_config): update for nm_system_apply_ip4_config()
+
+	* src/vpn-manager/nm-vpn-connection.c
+	  src/vpn-manager/nm-vpn-connection.h
+		- (nm_vpn_connection_get_ip4_config, nm_vpn_connection_get_ip_iface,
+		   nm_vpn_connection_get_parent_device): add
+		- (nm_vpn_connection_ip4_config_get): make the requirement of a tunnel
+			device explicit
+		- (connection_state_changed): update the named manager now that
+			nm_system_vpn_device_unset_from_ip4_config() is gone; do something
+			useful on errors
+
+	* src/vpn-manager/nm-vpn-manager.c
+	  src/vpn-manager/nm-vpn-manager.h
+		- Add a 'connection-activated' signal
+		- (nm_vpn_manager_get_active_connections): new function; mainly for the
+			policy to find out about active VPN connections
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/nm-logging.c (nm_logging_setup): Don't use LOG_CONS when running as
+	a daemon to prevent NM logging spew on console on startup and shutdown (due
+	to dependency loop between NM and syslog).
+
[phone]  Alexander Sack  <[e-mail]>
+
+	Implement managed mode. We bind devices configured in /etc/network/interfaces
+	to their connections by updating wired/wireless setting with the
+	mac address of the device.
+
+	* system-settings/plugins/ifupdown/plugin.c
+		- (get_net_address_for_udi): implement function to retrieve MAC
+			address of udi from hal in GByteArray format
+		- (bind_device_to_connection): bind mac address of device to
+			wired/wireless system connection
+		- (hal_device_added_cb): call bind_device_to_connection for
+			system connections with a matching interface.name
+		- (hal_device_added_cb): ensure that all code paths
+			properly free the "iface" string.
+
[phone]  Alexander Sack  <[e-mail]>
+
+	Parse nm-system-settings.conf and allow admins to either use managed and unmanaged
+	mode of the ifupdown system config plugin.
+
+	* system-settings/plugins/ifupdown/plugin.c
+		- (SCPluginIfupdown_init): parse nm-system-settings.conf keyfile and set
+			private unmanage_well_known state field accordingly
+
[phone]  Alexander Sack  <[e-mail]>
+
+	Implement unmanaged mode that will prevent all devices in the
+	well_known_udis set from being touched by NetworkManager
+
+	* system-settings/plugins/ifupdown/plugin.c
+		- (typedef struct SCPluginIfupdownPrivate): add gboolean
+			unmanage_well_known field used to turn on/off unmanaged
+			mode
+		- (hal_device_added_cb,hal_device_remove_cb): emit |unmanaged-devices-changed|
+			signal when well_known_udis get added/removed
+		- (SCPluginIfupdown_get_unmanaged_devices): return all well_known_udis
+			if we are in unmanaged mode
+
[phone]  Alexander Sack  <[e-mail]>
+
+	Add support to track network devices that have a configuration
+	with a matching interface.name in /etc/network/interfaces
+
+	* system-settings/plugins/ifupdown/plugin.c
+		- (typedef struct SCPluginIfupdownPrivate): add hash table
+			to track |well_known_udis|
+		- (get_iface_for_udi): helper function to get interface.name
+			for a udi
+		- (hal_device_added_cb, hal_device_removed_cb): callbacks
+			that add and remove devices to and from the well_known_udis
+			set depending on whether their |interface.name| matches
+			any interface definition in /etc/network/interfaces
+		- (SCPluginIfupdown_init): connect callbacks from above with
+			hal_mgr and setup well_known_udis hashtable
+		- (GObject__dispose): destroy well_known_udis hashtable
+		- (hal_device_added_cb2): implement wrapper callback with GFunc
+			signature. user_data is supposed to be a triple (hal_mgr,
+			config and devtype)
+		- (SCPluginIfupdown_init): bootstrap wired and wifi devices for
+			startup and call hal_device_added_cb2
+
[phone]  Alexander Sack  <[e-mail]>
+
+	Remove implementation for not used NMSystemConfigInterface callback functions
+	in ifupdown plugin
+
+	* system-settings/plugins/ifupdown/plugin.c
+		- (SCPluginIfupdown_unmanaged_devices_changed): removed
+		- (SCPluginIfupdown_connection_added): removed
+
[phone]  Dan Williams  <[e-mail]>
+
+	Add a 'hostname' dispatcher action triggered on hostname changes (bgo #552983)
+
+	* src/NetworkManagerUtils.c
+		- (nm_utils_call_dispatcher): add a 'hostname' action
+
+	* src/NetworkManagerPolicy.c
+		- (set_system_hostname): dispatch hostname changes
+
+	* callouts/nm-dispatcher-action.c
+		- (nm_dispatcher_action): handle 'hostname' actions
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+		- (find_route): ref the route so it doesn't get destroyed when the cache
+			is cleared
+		- (nm_system_device_set_priority): unref the route here after it's done
+			being used
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-serial-device.c
+		- Turn on serial debugging when NM_SERIAL_DEBUG is set in the environment
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/plugins/keyfile/nm-keyfile-connection.c (update): Update the
+	connection with new settings before saving it.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+		- nm_ip4_config_is_exported -> nm_ip4_config_get_dbus_path
+
+	* src/nm-device-interface.c
+		- (nm_device_interface_init): make 'ip4-config' a boxed property of type
+			DBUS_TYPE_G_OBJECT_PATH so that we can make it NULL when we need to
+			by using '/' for the object path
+
+	* src/nm-device.c
+		- (src/nm-device.c): marshal missing/unexported ip4-config through
+			dbus as '/' since dbus-glib can't handle NULL objects nor can
+			dbus handle NULL object paths
+
[phone]  Alexander Sack  <[e-mail]>
+
+	Implement system hostname support for debian/ubuntu
+
+	* system-settings/plugins/ifupdown/plugin.c
+		- (GObject__get_property): extend announced capabilities; add
+			NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME support
+		- (GObject__set_property,write_system_hostname): implement
+			NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME capability.
+		- (GObject__set_property, GObject__get_property, SCPluginIfupdown_init,
+		   update_system_hostname, get_hostname):
+			implement hostname property that watches and
+			parses /etc/hostname
+
[phone]  Alexander Sack  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c
+	  system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h
+	  system-settings/plugins/ifcfg-fedora/Makefile.am
+	  system-settings/src/nm-inotify-helper.c
+	  system-settings/src/nm-inotify-helper.h
+	  src/Makefile.am
+		- Move ifcfg-fedora inotify helpers to the system settings service so
+			they are available to all plugins
+
[phone]  Alexander Sack  <[e-mail]>
+
+	Implement support for wep-tx-keyidx in ifupdown system
+	config plugin.
+
+	* system-settings/plugins/ifupdown/parser.c
+		- (update_wireless_security_setting_from_if_block): introduce
+			free_type_mapping func table; rename a few local
+			variables to improve readability; add wpa security mapping
+			for wep-tx-keyidx property
+		- (string_to_gpointerint): new function used for the auto_type_mapping
+			of new wep-tx-keyidx property
+		- (slist_free_all): free func used for mapped slist types
+
[phone]  Alexander Sack  <[e-mail]>
+
+	* system-settings/src/main.c:
+		- (add_default_dhcp_connection, device_removed_cb): ensure the UDI is
+			always used as the hash key; fixes a crash when removing wired
+			devices
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-gsm-device.c
+		- (enter_pin_done, enter_pin, check_pin_done, real_act_stage1_prepare):
+			pass the required GSM secret along via user_data rather than keeping
+			it around in the private data where it sometimes didn't get cleared
+		- (real_get_ppp_name): implement using the GSM username
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c
+	  src/ppp-manager/nm-ppp-manager.h
+		- (impl_ppp_manager_need_secrets): tries secrets twice before asking
+			the settings daemon for completely new ones
+		- (create_pppd_cmd_line): new parameter 'ppp_name' used to set the
+			local PPP peer name; allow PPP debuging by launching NM with
+			the environment variable NM_PPP_DEBUG defined
+		- (nm_ppp_manager_start): new parameter 'ppp_name' passed to
+			create_pppd_cmd_line()
+
+	* src/nm-serial-device.c
+	  src/nm-serial-device.h
+		- New 'get_ppp_name' function for subclasses to implement to return the
+			local PPP peer name
+		- (real_act_stage2_config): call 'get_ppp_name' function of subclasses
+			and pass that name to the PPP manager
+
+	* src/nm-device-ethernet.c
+		- (pppoe_stage2_config): pass the PPPoE username to the PPP manager as
+			the local peer name
+
+	* src/nm-cdma-device.c
+		- (real_get_ppp_name): implement using the CDMA username
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Alexander Sack <asac ubuntu com>
+
+	* system-settings/plugins/ifupdown/parser.c
+		- Implement more graceful ip4 config parsing for cases where
+		  /etc/network/interfaces omits basic ip4 settings, such as gateway etc
+		  by using default values
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- (device_state_changed): when marking a connection invalid, clear its
+			secrets too so that fresh secrets get requested the next time
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/src/dbus-settings.c
+		- (nm_sysconfig_settings_init): cache system hostname on startup as
+			a fallback if no plugin provides a hostname
+		- (get_property): fall back to cached hostname if no plugin provides
+			a hostname
+
[phone]  Dan Williams  <[e-mail]>
+
+	Fix setting value comparison issue that caused some settings to look the
+	same when they were really different (rh #464417)
+
+	* libnm-util/nm-param-spec-specialized.c
+		- (type_is_fixed_size): return fundamental size of the fixed type too
+		- (nm_gvalues_compare_collection): use the fundamental fixed type size
+			in the comparison so that the _entire_ fixed type collection gets
+			compared rather than just the first 'len1' bytes
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- (lookup_thread_worker): don't store the idle handler ID because the
+			idle handler could have already run and freed the LookupThread
+			structure
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/nm-device.c (nm_device_get_priority): Implement.
+	(nm_device_set_ip4_config): Send the device priority to system ip4 
+	config setter.
+
+	* src/NetworkManagerSystem.c (nm_system_device_set_from_ip4_config):
+	Add priority argument and if it's >= 0, set the priority of the network
+	route added automatically by netlink (or kernel?).
+	(nm_system_device_set_priority): Implement.
+
+	* src/NetworkManagerPolicy.c (get_best_device): Use 
+	nm_device_get_priority() instead of home-grown version. Revert the
+	meaning, best priority is the lowest one.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Handle ipw3945 suspend/resume by retrying the GIWRANGE request a few times
+	when it returns EAGAIN (rh #362421)
+
+	* src/nm-device-wifi.c
+		- (wireless_get_range): try GIWRANGE a few times until the card responds
+		- (real_get_generic_capabilities, constructor): use wireless_get_range()
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-serial-device.c
+	  src/nm-serial-device.h
+		- (nm_serial_device_close): stop PPP manager here so that PPP gets
+			cleaned at the right times when subclasses close the serial port too
+		- (nm_serial_device_send_command): use a default send delay; don't
+			spin forever on EAGAIN
+		- (get_reply_done, get_reply_got_data, nm_serial_device_get_reply):
+			remove, no longer used
+		- (find_response): return the matched response if any
+		- (nm_serial_device_wait_reply_blocking): wait for a reply but block
+			while doing so
+		- (wait_for_reply_done): pass the matched response to the callback
+		- (wait_for_reply_got_data): save the matched response; simplify timeout
+			handling
+		- (nm_serial_device_wait_for_reply): make 'responses' and 'terminators'
+			const since they never get modified
+		- (cleanup_device): split out common cleanup stuff to a new function
+		- (real_deactivate_quickly, finalize): use cleanup_device()
+
+	* src/nm-gsm-device.c
+		- (modem_get_reply): remove, unused
+		- (set_apn): give the card a bit more time to respond
+		- (manual_registration_again, schedule_manual_registration_again,
+		   manual_registration_response, manual_registration): handle manual
+			registration timeouts better by retrying registration a few times
+			because cards are a bit slow after CFUN=1
+		- (automatic_registration_get_network, get_network_response): use
+			modem_wait_for_reply() because it interacts better with the serial
+			buffer and does more intelligent matching; need to wait for 'OK'
+			rather than just matching terminators
+		- (schedule_automatic_registration_again,
+		   automatic_registration_response, automatic_registration): retry
+			registration a few times on timeout or "searching" because cards
+			take a bit to find a network after being powered up with CFUN=1
+		- (power_up_response, power_up, init_full_done, enter_pin,
+		   check_pin_done): power up the card with CFUN=1 before trying to
+			register with the network
+		- (init_modem_full, init_modem): use more standard 3G init strings
+
+	* src/nm-hso-gsm-device.c
+		- (modem_get_reply): remove, unused
+		- (hso_ip4_config_response, real_act_stage3_ip_config_start): use
+			modem_wait_for_reply() to match actual responses instead of single
+			termination characters; it doesn't leave stuff in the serial buffer
+			that might confuse later calls
+		- (real_deactivate_quickly): use nm_serial_device_wait_reply_blocking()
+			to ensure that the call is really disconnected and not leave extra
+			stuff in the serial buffer
+
+	* src/nm-cdma-device.c
+		- (power_up_response, power_up, init_done): try Sierra-style modem
+			power up before attempting to connect
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-gsm.c
+		- (verify): verify GSM network ID
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-gsm.c
+	  libnm-util/nm-setting-gsm.h
+		- Fix up NM_GSM_NETWORK_* constants to accurately reflect the network
+			technology terms (bgo #551361)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Fix bgo #549401 (inspired by patch from Alexander Sack)
+
+	* src/nm-device-ethernet.c
+		- (finish_supplicant_task): clean up scheduled tasks and free memory
+		- (remove_supplicant_interface_error_handler): remove the supplicant
+			error idle callback too
+		- (supplicant_interface_release): rename from supplicant_interface_clean
+			to match nm-device-wifi.c; clean up supplicant interface-related
+			state tasks when the supplicant interface is disposed of
+		- (schedule_state_handler): add scheduled tasks to a list so they can
+			be cleaned up later
+		- (supplicant_mgr_state_cb_handler, supplicant_iface_state_cb_handler,
+		   supplicant_iface_connection_state_cb_handler): use
+			finish_supplicant_task() to clean up each completed task
+		- (supplicant_iface_connection_error_cb_handler,
+		   supplicant_connection_timeout_cb): clear source id when the task is
+			complete
+		- (supplicant_iface_connection_error_cb): save scheduled task id for
+			later cleanup
+		- (nm_device_ethernet_dispose): clean up any pending supplicant state
+			tasks
+
+	* src/nm-device-wifi.c
+		- (finish_supplicant_task): clean up scheduled tasks and free memory
+		- (remove_supplicant_interface_error_handler): remove the supplicant
+			error idle callback too
+		- (supplicant_interface_release): clean up supplicant interface-related
+			state tasks when the supplicant interface is disposed of
+		- (schedule_state_handler): add scheduled tasks to a list so they can
+			be cleaned up later
+		- (supplicant_mgr_state_cb_handler, supplicant_iface_state_cb_handler,
+		   supplicant_iface_connection_state_cb_handler): use
+			finish_supplicant_task() to clean up each completed task
+		- (supplicant_iface_connection_error_cb_handler): clear source id when
+			the task is complete
+		- (supplicant_iface_connection_error_cb): save scheduled task id for
+			later cleanup
+		- (nm_device_wifi_dispose): clean up any pending supplicant state tasks
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/plugins/keyfile/plugin.c: Implement unmanaged_devices
+	method and get/set hostname property.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/supplicant-manager/nm-supplicant-interface.c
+	(nm_supplicant_interface_disconnect): Don't increment the reference 
+	count when disconnecting. The problem is on shutdown, when the replies
+	to these commands do not arrive before NM exits, resulting on never
+	calling supplicant interface's dispose(), which removes the interface
+	from supplicant.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* libnm-glib/nm-vpn-plugin-ui-interface.c: Add type checking to
+	all the public function arguments.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/vpn-manager/nm-vpn-connection.c: Add a signal handler for the
+	"Failure" signal from VPN plugins, store the failure reason, and
+	use it when the state is changed to failure.
+
+	* introspection/nm-vpn-plugin.xml: Fix the "Failure" signal's type
+	description.
+
+	* include/NetworkManagerVPN.h (NMVPNConnectionStateReason): Add a new
+	reason to the end of the list to not break the API.
+	(NMVPNPluginFailure): Move it here (from libnm-glib/nm-vpn-plugin.h)
+	so it can be shared by plugins and daemon.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Alexander Sack <[e-mail]>
+
+	* configure.in
+	  system-settings/plugins/Makefile.am
+	  system-settings/plugins/ifupdown/Makefile.am
+	  system-settings/plugins/ifupdown/interface_parser.c
+	  system-settings/plugins/ifupdown/interface_parser.h
+	  system-settings/plugins/ifupdown/nm-ifupdown-connection.c
+	  system-settings/plugins/ifupdown/nm-ifupdown-connection.h
+	  system-settings/plugins/ifupdown/parser.c
+	  system-settings/plugins/ifupdown/parser.h
+	  system-settings/plugins/ifupdown/plugin.c
+	  system-settings/plugins/ifupdown/plugin.h
+		- Implement a Debian/Ubuntu legacy network configuration plugin
+			(gnome.org #551941)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Implement support for honoring configured and automatic hostnames, and for
+	setting the configured hostname.
+
+	* introspection/nm-ip4-config.xml
+	  src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+	  src/dhcp-manager/nm-dhcp-manager.c
+		- Remove useless hostname property; it's not really part of the IPv4
+			config
+
+	* introspection/nm-settings-system.xml
+	  libnm-glib/nm-dbus-settings-system.c
+	  libnm-glib/nm-dbus-settings-system.h
+		- Add SetHostname() call to system settings D-Bus interface
+		- Add Hostname property to system settings D-Bus interface
+		- (nm_dbus_settings_system_save_hostname,
+		   nm_dbus_settings_system_get_hostname): implement
+
+	* src/nm-device.c
+	  src/nm-device.h
+		- (nm_device_get_dhcp4_config): implement
+
+	* src/nm-manager.c
+	  src/nm-manager.h
+		- Fetch and track system settings service hostname changes, and proxy
+			the changes via a GObject property of the manager
+
+	* system-settings/src/nm-system-config-interface.c
+	  system-settings/src/nm-system-config-interface.h
+		- Replace nm_system_config_interface_supports_add() with a capabilities
+			bitfield
+
+	* system-settings/src/nm-system-config-error.c
+	  system-settings/src/nm-system-config-error.h
+		- Add additional errors
+
+	* system-settings/src/dbus-settings.c
+	  system-settings/src/dbus-settings.h
+		- (get_property, nm_sysconfig_settings_class_init): add hostname
+			property; first plugin returning a hostname wins
+		- (impl_settings_add_connection): use plugin capabilities instead of
+			nm_system_config_interface_supports_add()
+		- (impl_settings_save_hostname): implement hostname saving
+
+	* src/NetworkManagerPolicy.c
+		- (lookup_thread_run_cb, lookup_thread_worker, lookup_thread_new,
+		   lookup_thread_die): implement an asynchronous hostname lookup thread
+			which given an IPv4 address tries to look up the hostname for that
+			address with reverse DNS
+		- (get_best_device): split out best device code from
+			update_routing_and_dns()
+		- (update_etc_hosts): update /etc/hosts with the machine's new hostname
+			to preserve the 127.0.0.1 reverse mapping that so many things require
+		- (set_system_hostname): set a given hostname
+		- (update_system_hostname): implement hostname policy; a configured
+			hostname (from the system settings service) is used if available,
+			otherwise an automatically determined hostname from DHCP, VPN, etc.
+			If there was no automatically determined hostname, reverse DNS of
+			the best device's IP address will be used, and as a last resort the
+			hostname 'localhost.localdomain' is set.
+		- (update_routing_and_dns): use get_best_device(); update the system
+			hostname when the network config changes
+		- (hostname_changed): update system hostname if the system settings
+			service signals a hostname change
+		- (nm_policy_new): list for system settings service hostname changes
+		- (nm_policy_destroy): ensure that an in-progress hostname lookup thread
+			gets told to die
+
+	* system-settings/plugins/keyfile/plugin.c
+	  system-settings/plugins/ifcfg-suse/plugin.c
+		- (get_property, sc_plugin_ifcfg_class_init): implement hostname and
+			capabilities properties
+
+	* system-settings/plugins/ifcfg-fedora/shvar.c
+		- (svOpenFile): re-enable R/W access of ifcfg files since the plugin
+			writes out /etc/sysconfig/network now
+
+	* system-settings/plugins/ifcfg-fedora/plugin.c
+		- (plugin_get_hostname): get hostname from /etc/sysconfig/network
+		- (plugin_set_hostname): save hostname to /etc/sysconfig/network
+		- (sc_network_changed_cb): handle changes to /etc/sysconfig/network
+		- (sc_plugin_ifcfg_init): monitor /etc/sysconfig/network for changes
+		- (get_property, set_property, sc_plugin_ifcfg_class_init): implement
+			hostname get/set and capabilities get
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-wireless.c
+		- (nm_setting_wireless_ap_security_compatible): only verify pairwise and
+			group ciphers if the wireless-security setting explicitly specified
+			them, effectively making the default be "all ciphers"  (idea from
+			Alexander Sack)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Alexander Sack <[e-mail]>
+
+	* src/named-manager/nm-named-manager.c
+		- (dispatch_resolvconf): respect resolvconf exit code
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/named-manager/nm-named-manager.c (dispatch_netconfig): Make it compile
+	again. Add some debugging.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/keyfile/plugin.c
+		- (update_connection_settings): update connection manually, since
+			nm_exported_connection_update() does authentication
+		- (dir_changed): update_connection_settings() doesn't need to return
+			an error
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-vpn-plugin-ui-interface.c
+	  libnm-glib/nm-vpn-plugin-ui-interface.h
+	  libnm-glib/libnm_glib_vpn.ver
+		- (nm_vpn_plugin_ui_interface_delete_connection): called when the plugin
+			should clean up resources related to the connection (like keyring
+			secrets)
+		- (nm_vpn_plugin_ui_widget_interface_save_secrets): called when the plugin
+			should save user-scope secrets (like to the keyring)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Alexander Sack <[e-mail]>
+
+	* libnm-util/crypto_gnutls.c
+	  libnm-util/crypto_nss.c
+		- (crypto_init, crypto_deinit): just use a boolean instead of a refcount
+
+	* libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+	  libnm-util/libnm-util.ver
+		- (nm_utils_init): initialize libnm-util
+		- (nm_utils_deinit): de-initialize libnm-util and clean up resources
+
+	* libnm-util/nm-setting-8021x.c
+		- (nm_setting_802_1x_class_init): init libnm-util when needed
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Roy Marples <[e-mail]> and others
+
+	* configure.in
+	  src/named-manager/nm-named-manager.c
+		- Add support for resolvconf; use --with-resolvconf at configure time
+			to enable it
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/crypto_nss.c
+	  libnm-util/crypto_gnutls.c
+	  libnm-util/crypto.h
+		- (crypto_init): return error when init fails
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-device-wifi.c
+		- (access_point_removed_proxy): clean up the active access point too
+			just in case the active ap changed signal didn't come through yet
+		- (clean_up_aps): be sure to set priv->active_ap to NULL when cleaning up
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-client.c
+		- (constructor): get initial state after we know whether NM is running
+			or not
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-ip4-config.c
+	  libnm-glib/nm-dhcp4-config.c
+		- (finalize): clean up the DBusGProxy
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+		- (nm_ip4_config_new): don't export over D-Bus here
+		- (nm_ip4_config_export): new function; export the config over D-Bus
+		- (nm_ip4_config_is_exported): new function
+
+	* src/nm-device.c
+		- (nm_device_activate_stage5_ip_config_commit): fix leak of IP4Config
+			objects by balancing the IP4Config constructor; the device holds
+			a reference to the IP4Config already
+		- (nm_device_set_ip4_config): export the IP4Config when needed
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/supplicant-manager/nm-supplicant-settings-verify.c
+		- Allow WPA-NONE key management for Ad-Hoc WPA connections
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-vpn.c
+	  libnm-util/nm-setting-vpn.h
+		- Split VPN secrets from VPN data so that settings services can actually
+			figure out that they are secrets and store them accordingly
+
+	* system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/plugins/keyfile/reader.c
+	  system-settings/plugins/keyfile/reader.h
+	  system-settings/plugins/keyfile/writer.c
+		- Store VPN secrets separately from VPN data so that they can be fetched
+			on demand
+		- Implement the get_secrets() call so that (a) secrets don't leak out
+			to unprivileged callers, and (b) secrets can be sent to privileged
+			callers when needed
+
+	* vpn-daemons/vpnc/src/nm-vpnc-service.c
+		- Handle split VPN secrets
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (make_ip4_setting): use DOMAIN not SEARCH (rh #459370)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Ensure zombie children get cleaned up.  To get notifications when children
+	die abnormally, g_spawn_async() requires G_SPAWN_DO_NOT_REAP_CHILD, but
+	that requires calling waitpid() yourself if you've removed the child watch
+	handler before the process has actually died, which NM needs to do in a few
+	places.  So ensure that everything uses G_SPAWN_DO_NOT_REAP_CHILD and also
+	cleans up after the child when required.  Should fix problems trying to
+	activate mobile broadband connections after a previous failure.
+
+	* src/dhcp-manager/nm-dhcp-dhclient.c
+	  src/dhcp-manager/nm-dhcp-dhcpcd.c
+		- Use G_SPAWN_DO_NOT_REAP_CHILD
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+		- (nm_dhcp_device_destroy): ensure child is cleaned up
+		- (nm_dhcp_client_stop, nm_dhcp_manager_cancel_transaction_real): always
+			block on child quitting, since the non-blocking functionality was
+			never actually used
+
+	* src/dnsmasq-manager/nm-dnsmasq-manager.c
+		- (dm_watch_cb): child is already reaped here
+		- (ensure_killed, nm_dnsmasq_manager_stop): block until child is dead
+
+	* src/nm-device.c
+		- (aipd_cleanup): block until child is dead
+
+	* src/named-manager/nm-named-manager.c
+		- (run_netconfig): don't use G_SPAWN_DO_NOT_REAP_CHILD if we aren't
+			event bothering to watch the child
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (ppp_watch_cb): child is already reaped here
+		- (ensure_killed, nm_ppp_manager_stop): block until child is dead
+
+	* src/vpn-manager/nm-vpn-service.c
+		- (vpn_service_watch_cb): child is already reaped here
+		- (nm_vpn_service_daemon_exec): use G_SPAWN_DO_NOT_REAP_CHILD so that
+			status of the child is actually tracked
+		- (ensure_killed, finalize): block until child is dead
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/keyfile/nm-keyfile-connection.c
+		- (update): Update filename of the connection if the connection id
+			was changed
+
+	* system-settings/plugins/keyfile/plugin.c
+		- (dir_changed): first pass at handling connection renames correctly
+
+	* system-settings/plugins/keyfile/writer.c
+	  system-settings/plugins/keyfile/writer.h
+		- (write_connection): replace '/' with '*' when writing out the filename
+			from the connection id
+
[phone]  Dan Williams  <[e-mail]>
+
+	Add connection UUIDs, since connection names can be changed, and since
+	old-style connection IDs could change over the life of the connection.  The
+	UUID should be assigned at connection creation time, be stable for a given
+	connection, and should be unique among all connections for a given settings
+	service.
+
+	* configure.in
+	  libnm-util/Makefile.am
+		- Require libuuid
+
+	* introspection/nm-exported-connection.xml
+		- Remove "GetID" method
+
+	* libnm-glib/nm-dbus-connection.c
+	  libnm-glib/nm-settings.c
+	  libnm-glib/nm-settings.h
+		- Remove id-related stuff
+
+	* libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+	  libnm-util/libnm-util.ver
+		- (nm_utils_uuid_generate, nm_utils_uuid_generate_from_string): Add
+			utility functions to generate UUIDs
+
+	* libnm-util/nm-setting-connection.c
+	  libnm-util/nm-setting-connection.h
+		- Add 'uuid' member to the connection setting
+		- (verify): require valid 'uuid' for a valid connection
+
+	* system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c
+	  system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-suse/nm-suse-connection.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+	  system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/src/main.c
+		- Remove id-related stuff
+		- Give connections UUIDs where needed
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/crypto_gnutls.c
+	  libnm-util/crypto_nss.c
+		- (crypto_init, crypto_deinit): refcount init/deinit
+		- (crypto_md5_hash): allow NULL salt
+
[phone]  Michael Biebl  <[e-mail]>
+
+	* libnm-glib/Makefile.am
+	  libnm-util/Makefile.am
+	  libnm-glib/libnm_glib.ver
+	  libnm-glib/libnm_glib_vpn.ver
+	  libnm-util/libnm-util.ver
+		- Use linker version scripts to control the list of exported 
+		symbols. List each exported symbol explicitely.
+	* libnm-util/Makefile.am
+		- Fix compilation of the test-crypto binary. The crypto
+		functions are no longer part of the libnm-util API. Add 
+		crypto_*.c to test_crypto_SOURCES and link against the correct
+		crypto libraries.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* configure.in
+	  test/Makefile.am
+		- Don't build test/test-common
+		- Remove unused stuff
+
+	* test/nm-set-fallback
+	  test/nmtestdevices.c
+	  test/test-common/.cvsignore
+	  test/test-common/Makefile.am
+	  test/test-common/test-common.c
+	  test/test-common/test-common.h
+		- delete
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+		- (nm_utils_garray_to_string): remove; NM was the only user and doesn't
+			export anything that needs to be converted with this function
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+		- (garray_to_string): convert a byte array to a UTF-8 string with
+			minimal validation; the DHCP client sends it in ASCII anyway
+		- (get_option, copy_option): use garray_to_string()
+
[phone]  Dan Williams  <[e-mail]>
+
+	* include/NetworkManager.h
+	  introspection/nm-device.xml
+		- Add a "missing firmware" device state reason
+
+	* src/NetworkManagerSystem.c
+	  src/NetworkManagerSystem.h
+		- (nm_system_device_set_up_down): add a no_firmware argument
+		- (nm_system_device_set_up_down_with_iface): if the result of setting
+			IFF_UP is ENOENT, that almost always means missing firmware
+
+	* src/backends/NetworkManagerGeneric.c
+	  src/nm-device-ethernet.c
+	  src/nm-device-private.h
+	  src/nm-device-wifi.c
+	  src/nm-device.c
+	  src/nm-device.h
+	  src/nm-hso-gsm-device.c
+	  src/vpn-manager/nm-vpn-connection.c
+		- Pass no_firmware along; check it where appropriate
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Robert Buchholz <[e-mail]>
+
+	* autogen.sh
+	  configure.in
+		- Change to automake 1.9 and 'ustar' tar format defined by POSIX
+			1003.1-1988, allowing for file names longer than 99 characters
+
[phone]  Dan Williams  <[e-mail]>
+
+	* include/NetworkManager.h
+	  introspection/nm-device.xml
+	  src/nm-gsm-device.c
+		- Finer-grained GSM registration failure error codes
+
[phone]  Dan Williams  <[e-mail]>
+
+	* callouts/Makefile.am
+	  src/Makefile.am
+		- Move dispatcher directory creation to callouts/Makefile.am
+
+	* system-settings/plugins/keyfile/Makefile.am
+		- Create keyfile connections directory in DESTDIR (bgo #546833)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Do connection sharing in a cleaner manner; all required iptables rules
+	are now stored in the activation request and pertain only to the device
+	which is being shared to other computers. (rh #458625)
+
+	* src/nm-activation-request.c
+	  src/nm-activation-request.h
+		- (nm_act_request_add_share_rule): new function; add a sharing rule to
+			the activation request which will get torn down automatically when
+			the activation request dies
+		- (nm_act_request_set_shared): push sharing rules to iptables when sharing
+			is started, and tear them down when sharing is stopped
+
+	* src/nm-device.c
+		- (start_sharing): start up sharing by doing the required iptables magic
+		- (share_init): poke the right bits of the kernel and load the right
+			modules for NAT
+		- (nm_device_activate_stage5_ip_config_commit): start NAT-ing this
+			connection if it's a 'shared' connection
+
+	* src/NetworkManagerPolicy.c
+		- Remove all sharing stuff; done in the device code itself
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/dnsmasq-manager/nm-dnsmasq-manager.c
+		- (create_dm_cmd_line): send the right router address
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (pppd_timed_out): ensure timeouts fail the connection
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-properties-changed-signal.c
+	  src/nm-properties-changed-signal.h
+		- Add a property spec flag for "don't export this property" in
+			property changed signals
+
+	* src/nm-hso-gsm-device.c
+	  src/nm-gsm-device.c
+	  src/nm-cdma-device.c
+		- Don't export monitor interface or netdev interface properties
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- (update_routing_and_dns): 'hso' devices can be default even if they
+			don't have a gateway
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device.c
+		- (nm_device_deactivate_quickly): tear down activation request after
+			calling device-specific deactivation
+
+	* src/nm-hso-gsm-device.c
+		- (real_deactivate_quickly): terminate connection when deactivating
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-activation-request.h
+		- Add HSO secrets caller
+
+	* src/nm-gsm-device.c
+	  src/nm-gsm-device.h
+		- (modem_wait_for_reply): add a 'user_data' argument so callers can pass
+			something to the callback function
+		- (set_apn, set_apn_done): call class dial function, not a static one
+		- (nm_gsm_device_class_init): add a class 'dial' function
+
+	* src/nm-hal-manager.c
+		- (get_hso_netdev): find the hso-driven hardware's net device
+		- (modem_device_creator): recognize hso-driven hardware and create the
+			right type of device object for it
+
+	* src/Makefile.am
+	  src/nm-hso-gsm-device.c
+	  src/nm-hso-gsm-device.h
+		- Implement support for devices driven by the 'hso' driver as a subclass
+			of NMGsmDevice
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+		- (nm_system_device_is_up_with_iface): ensure ifreq is cleared before using
+		- (nm_system_device_set_up_down_with_iface): cleanups; only return
+			success if the operation really was successful
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-netlink-monitor.c
+	  src/nm-netlink-monitor.h
+	  src/nm-device-ethernet.c
+		- (nm_netlink_monitor_request_status): return an error on failure
+		- (constructor): don't segfault on missing error
+
[phone]  Dan Williams  <[e-mail]>
+
+	* callouts/nm-dispatcher-action.c
+		- Add IP4 config info to script environment
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device.c
+		- (nm_device_set_ip4_config): don't touch hostnames here; distros
+			that want to use DHCP hostnames should use dispatcher scripts
+			for that
+
+	* src/NetworkManagerSystem.h
+	  src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGeneric.c
+	  src/backends/NetworkManagerGeneric.h
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+		- Remove nm_system_set_hostname(), no longer used
+	  
+	* src/backends/Makefile.am
+	  src/backends/shvar.c
+	  src/backends/shvar.h
+		- Remove shvar.*; no longer used
+
[phone]  Dan Williams  <[e-mail]>
+
+	Revert most of the 'hostname' patch.  Too much stuff still breaks when
+	hostname is updated at runtime.  Distros or users who want hostname updates
+	can use dispatcher scripts to update the hostname if they need it.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* introspection/nm-settings-system.xml
+	  system-settings/src/dbus-settings.c
+	  system-settings/src/dbus-settings.h
+		- Add a 'Hostname' property (rw) which represents the configured
+			hostname and domain of the system, if any
+
+	* system-settings/src/nm-system-config-error.c
+	  system-settings/src/nm-system-config-error.h
+	  system-settings/src/nm-system-config-interface.c
+	  system-settings/src/nm-system-config-interface.h
+		- Add a 'hostname' property to the plugin interface
+		- Add a method to send updated hostname to plugins to save in their
+			backing configuration store
+
+	* system-settings/plugins/keyfile/nm-keyfile-connection.c
+	  system-settings/plugins/keyfile/plugin.c
+	  system-settings/plugins/keyfile/writer.c
+	  system-settings/plugins/keyfile/writer.h
+	  system-settings/plugins/ifcfg-suse/plugin.c
+		- Add minimal hostname support
+
+	* system-settings/plugins/ifcfg-fedora/plugin.c
+		- Add support for updating system hostname in /etc/sysconfig/network
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/shvar.c
+	  system-settings/plugins/ifcfg-fedora/shvar.c
+		- Fix double-free caused by svSetValue() followed by svCloseFile()
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* Makefile.am: Fix distcheck.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* libnm-glib/*.c. Document some more.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	Start documenting libnm-glib public API using gtk-doc.
+
+	* libnm-glib/nm-serial-device.c: 
+	* libnm-glib/nm-object.c: 
+	* libnm-glib/nm-gsm-device.c: 
+	* libnm-glib/nm-device.c: 
+	* libnm-glib/nm-device-wifi.c: 
+	* libnm-glib/nm-device-ethernet.c: 
+	* libnm-glib/nm-client.c: 
+	* libnm-glib/nm-cdma-device.c: Document the public API.
+
+	* docs/libnm-glib/libnm-glib.types: Implement.
+
+	* docs/libnm-glib/Makefile.am: Implement.
+
+	* autogen.sh: 
+	* configure.in: 
+	* Makefile.am: Add gtk-doc support.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/backends/*: Get rid of nm_system_should_modify_resolv_conf().
+
+	* src/named-manager/nm-named-manager.c (rewrite_resolv_conf): Calculate
+	the composite result of all the IP4 configurations and call a distro
+	specific update_resolv_conf().
+	(update_resolv_conf): Implement one for directly writing to 
+	/etc/resolv.conf and one for opensuse to call netconfig.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (impl_ppp_manager_need_secrets): pass interface as required
+
[phone]  Dan Williams  <[e-mail]>
+
+	Merge the vpn-properties setting with the vpn setting since it was pointless
+	to keep both of them around.  Convert the vpn 'data' hash table to a hash
+	of string:string (instead of string:variant) so that system settings plugins
+	can have an easier time dealing with the arbitrary key/value pairs.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-utils.c
+		- (nm_utils_register_value_transformations): add value transform for
+			a hash table of string:string
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-vpn-plugin.c
+		- (nm_vpn_plugin_connect): stop plugin after connection failure from
+			an idle handler so the Connect reply gets delivered before the
+			stop StateChanged signal
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-ip4-config.c
+		- (get_property): use common ip4 address/route conversion functions
+		- (nm_ip4_config_replace_address, nm_ip4_config_replace_route): should
+			copy the new route here, not take ownership
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-suse/parser.c (make_ip4_setting):
+	Update the IP4 setting's method name.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* introspection/nm-ip4-config.xml
+	  libnm-glib/libnm-glib-test.c
+	  libnm-glib/nm-ip4-config.c
+	  libnm-glib/nm-ip4-config.h
+	  src/NetworkManagerSystem.h
+	  src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGeneric.c
+	  src/backends/NetworkManagerGeneric.h
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+	  src/dhcp-manager/nm-dhcp-manager.c
+	  src/nm-device.c
+	  src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+		- Remove NIS logic; should be done from dispatcher scripts instead
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+		- (nm_dhcp_manager_get_ip4_config): fix regression which caused
+			mis-handling of DHCP responses that returned more than one router
+			(found by Grant Williamson)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* callouts/nm-dispatcher-action.c
+		- (nm_dispatcher_action): grab device path and create the device; pass
+			the device's DHCP4 config to script caller
+		- (dispatch_scripts): dump the DHCP4 config to the environment of called
+			scripts
+
+	* libnm-glib/nm-dhcp4-config.c
+	  libnm-glib/nm-dhcp4-config.h
+		- (nm_dhcp4_config_get_options): expose
+		- (nm_dhcp4_config_get_one_option): renamed from nm_dhcp4_config_get_option
+
[phone]  Dan Williams  <[e-mail]>
+
+	* include/NetworkManager.h
+		- Add the DHCP4Config D-Bus interface
+
+	* libnm-glib/Makefile.am
+	  libnm-glib/nm-dhcp4-config.c
+	  libnm-glib/nm-dhcp4-config.h
+		- Handle DHCP4 config objects exported by NM over D-Bus
+
+	* libnm-glib/nm-device.c
+	  libnm-glib/nm-device.h
+		- Add a 'dhcp4-config' property
+
+	* libnm-glib/libnm-glib-test.c
+		- Print out DHCP4 config for devices
+		- Fix some crashes when no connections are active
+
+	* src/nm-device-interface.c
+	  src/nm-device.c
+	  src/nm-dhcp4-config.c
+	  src/nm-dhcp4-config.h
+		- Treat dhcp4-config object as an object path at the D-Bus interface so
+			that when it doesn't exist we can proxy it as "/" which dbus-glib
+			doesn't let us do when the property type is G_TYPE_OBJECT
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManager.c
+	  src/NetworkManagerSystem.h
+	  src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGeneric.c
+	  src/backends/NetworkManagerGeneric.h
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+		- (nm_system_init, nm_system_kill_all_dhcp_daemons): remove, unused
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-ip4-config.c
+	  libnm-glib/nm-ip4-config.h
+		- Add 'routes' property
+
+	* libnm-util/nm-setting-vpn.c
+	  libnm-util/nm-setting-vpn.h
+		- Remove 'routes' property
+
+	* libnm-util/nm-setting-ip4-config.c
+	  libnm-util/nm-setting-ip4-config.h
+		- 'ignore-dhcp-dns' renamed to 'ignore-auto-dns'
+		- Add 'ignore-auto-routes' property
+		- 'routes' exposed over D-Bus is now an array of array of uint (4) to 
+			accomodate route metrics
+		- 'routes' exposed in C is now a list of NMSettingIP4Route structures
+
+	* libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+		- Add helpers for marshalling IP4 routes
+
+	* src/NetworkManagerUtils.c
+		- (nm_utils_merge_ip4_config): handle property renames and new route
+			structure
+
+	* src/NetworkManagerSystem.c
+		- (nm_system_device_set_ip4_route, nm_system_device_set_from_ip4_config,
+		   nm_system_vpn_device_set_from_ip4_config): respect route metrics
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+		- (nm_dhcp_manager_get_ip4_config): handle new route structure
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-fedora/writer.c
+		- Handle routes separately from addresses now that routes have a different
+			format
+
+	* introspection/nm-ip4-config.xml
+	  src/nm-ip4-config.c
+	  src/nm-ip4-config.h
+		- Rename internal routing functions
+		- 'static-routes' renamed to 'routes'
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Sjoerd Simons <[e-mail]>
+
+	* src/NetworkManager.c
+	  src/nm-manager.c
+	  src/nm-manager.h
+		- More explicitly make the NMManager a singleton
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-connection.c
+	  libnm-util/nm-connection.h
+		- (nm_connection_verify): return error on missing 'connection' setting
+			(found by Sjoerd Simons)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Handle multiple concurrent PPP connections.
+
+	* src/ppp-manager/nm-ppp-manager.c
+	  src/ppp-manager/nm-ppp-manager.h
+		- (constructor): only PPP Manager request bus name once; each
+			NMPPPManager object gets a unique object path
+		- (nm_ppp_manager_class_init, get_property, set_property,
+		   nm_ppp_manager_new, nm_ppp_manager_start): pass parent interface in
+			at construct time
+		- (impl_ppp_manager_need_secrets, impl_ppp_manager_set_state): don't
+			remove timeout until PPP manager gets an IP4 config
+		- (create_pppd_cmd_line): pass dbus object path as 'ipparam' so that
+			the plugin can call back to this specific PPP manager instance
+
+	* src/nm-device-ethernet.c
+	  src/nm-serial-device.c
+		- Pass parent device in nm_ppp_manager_new()
+
+	* src/nm-gsm-device.c
+	  src/nm-cdma-device.c
+	  	- (device_state_changed): don't close serial device on NEED_AUTH
+	  		state changed, that's not a failure case like the rest are
+
+	* src/ppp-manager/nm-pppd-plugin.c
+		- (nm_ip_up): always use index 0 into the ipcp options, because NM always
+			binds one interface to any pppd process, thus the correct index
+			is always 0; send PHASE_DEAD on error to alert NM immediately of
+			problems; try harder to get a peer address in spite of pppd
+		- (plugin_init): use 'ipparam' as the object path back to our specific
+			PPP manager instance
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (impl_ppp_manager_need_secrets): rework to handle secrets better;
+			since the GSM and CDMA settings now implement need_secrets, we can
+			rely on them to do the right thing.  Where secrets are not required,
+			just pass empty strings back to the pppd plugin.
+		- (nm_ppp_manager_update_secrets): leak fix; don't need to dup the strings
+		- (impl_ppp_manager_set_ip4_config): clear the secrets tries counter
+			on successful IP4 config receipt
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-cdma.c
+	  libnm-util/nm-setting-gsm.c
+		- (verify): validate username & password if they exist
+		- (need_secrets): if username given, require a password too
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/dnsmasq-manager/nm-dnsmasq-manager.c
+		- (create_dm_cmd_line): really don't listen on lo, despite what the
+			manpage says about --listen-address without --interface
+			(bgo #546033)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-device.c
+		- (proxy_get_string): util function for querying a HAL property
+		- (get_ancestor_device): split out from get_product_and_vendor()
+		- (get_product_and_vendor): simplify; get more accurate pid & vid info
+			from PCI devices by querying subsys properties
+		- (nm_device_update_description): simplify
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-ip4-config.c
+	  libnm-util/nm-setting-ip4-config.h
+		- Make IPv4 methods reflect their usage; 'dhcp' -> 'auto' and
+			'autoip' -> 'link-local'.  VPN & PPP connections can also have IPv4
+			settings, and they don't necessarily use DHCP.
+
+	* src/NetworkManagerPolicy.c
+	  src/nm-device.c
+	  system-settings/plugins/ifcfg-fedora/reader.c
+	  system-settings/plugins/ifcfg-suse/parser.c
+		- Fixup for method changes
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-activation-request.c
+	  src/vpn-manager/nm-vpn-connection.c
+		- Correct GetSecrets D-Bus pending call usage; the GetSecrets call
+			itself should be attached to the activation request or the VPN
+			connection, not the NMConnection object, since the call is not
+			expected to live as long as the NMConnection itself
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-wifi.c
+		- (real_act_stage2_config): fix issue where association would continue
+			even though secrets were needed; 'goto out' was in wrong scope and
+			result of handle_auth_or_fail() should have been dumped directly to
+			'ret' to ensure that the association was postponed until secrets
+			are available
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/plugin.c
+	  system-settings/plugins/ifcfg-fedora/reader.c
+		- Don't ignore unmanaged devices if their ifcfg file doesn't make a
+			valid NM connection
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-gsm-device.c
+		- (automatic_registration_response, automatic_registration): recognize
+			denied registration and reorder responses
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-serial-device.c
+		- (nm_serial_device_wait_for_reply): fix timeout calculation.  Since
+			time(2) is used for current time, which returns seconds, we shouldn't
+			be multiplying by 1000.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Fabrice Bellet <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+		- (route_in_same_subnet): mask addresses and compare them so that the
+			function actually does what it says it's going to do (rh #456685)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-ip6-config.c
+		- (set_property): add missing break that caused routes to be overwritten
+			with addresses
+
+	* libnm-util/nm-setting-ip6-config.c
+		- (verify): validate routes and return GError everywhere on invalid setting
+		- (finalize): don't leak routes
+		- (set_property): add missing break that caused routes to be overwritten
+			with addresses
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/*
+		- Relicense to LGPLv2+
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (make_ip4_setting): fix parsing automatic configs
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/dnsmasq-manager/nm-dnsmasq-manager.c
+	  src/nm-device.c
+	  src/ppp-manager/nm-ppp-manager.c
+		- Ensure child process gets reaped.  The child watch function may be
+			removed from the mainloop before the child gets killed, so we have
+			to make sure the child is reaped when it's told to die intentionally
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Roy Marples <[e-mail]>
+
+	* src/dhcp-manager/nm-dhcp-dhcpcd.c
+		- (nm_dhcp_client_start): fixup for latest dhcpcd 4.0 RC
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-gsm-device.c
+		- (init_modem_full): send "ATZ E0" after CPIN, because apparently some
+			Huawei devices turn echo back on after CPIN (rh #456770)
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_update_secrets): Add
+	format argument to g_set_error() call.
+
+	* src/backends/interface_parser.[ch]: Remove.
+
+	* src/backends/Makefile.am: Remove unused files interface_parser.[ch].
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c
+		- (create_pppd_cmd_line): send 'noipdefault' on non-PPPoE connections
+			to prevent pppd from picking up some random local address from an
+			interface that doesn't have anything to do with the one we're
+			interested in (rh #455348)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-utils.c
+		- (string_to_utf8): general function for conversion to UTF-8 assisted
+			by locale
+		- (nm_utils_ssid_to_utf8): use string_to_utf8()
+		- (nm_utils_garray_to_string): ensure returned string is UTF-8 safe
+
[phone]  Dan Williams  <[e-mail]>
+
+	* introspection/Makefile.am
+	  introspection/nm-device.xml
+	  introspection/nm-dhcp4-config.xml
+		- Add bits for the DHCP4Config property of the device, and the DHCP4Config
+			itself
+	* src/nm-device-interface.c
+	  src/nm-device-interface.h
+		- Add the DHCP4Config property
+
+	* src/nm-device.c
+		- Keep track of DHCP4 options via a new DHCP4Config property and notify
+			D-Bus clients when it changes
+
+	* src/nm-dhcp4-config.c
+	  src/nm-dhcp4-config.h
+		- Simple object to store DHCP4 options, export them over D-Bus, and
+			notify when they change
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+	  src/dhcp-manager/nm-dhcp-manager.h
+		- (nm_dhcp_manager_set_dhcp4_config, copy_dhcp4_config_option): copy and
+			filter server-returned DHCP options into an NMDHCP4Config object
+
[phone]  Dan Williams  <[e-mail]>
+
+	* introspection/nm-device.xml
+		- Add device state reasons
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Roy Marples <[e-mail]>
+
+	* configure.in
+		- Add --with-dhcp-client option
+
+	* src/dhcp-manager/Makefile.am
+		- pass DHCP_CLIENT_PATH on compile line
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+	  src/dhcp-manager/nm-dhcp-manager.h
+		- Genericize for both dhcpcd and dhclient
+
+	* src/dhcp-manager/nm-dhcp-dhclient.c
+		- Move dhclient stuff out to it's own file from nm-dhcp-manager.c
+
+	* src/dhcp-manager/nm-dhcp-dhcpcd.c
+		- Implement support for dhcpcd too
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/src/nm-system-config-interface.c 
+	(nm_system_config_interface_supports_add): Implement.
+	(nm_system_config_interface_add_connection): Return a boolean to notify
+	of errors.
+
+	* system-settings/src/nm-polkit-helpers.c: 
+	* system-settings/src/nm-polkit-helpers.h: Move error declarations to
+	a separate file.
+
+	* system-settings/src/dbus-settings.c (impl_settings_add_connection):
+	Return an error when none of the plugins support add or if addition
+	failed for some reason.
+
+	* system-settings/src/nm-system-config-error.h: 
+	* system-settings/src/nm-system-config-error.c: New files, mostly moved
+	here from nm-polkit-helpers.[ch].
+
+	* system-settings/src/Makefile.am: Build new files.
+
+	* system-settings/plugins/keyfile/reader.c 
+	(read_array_of_array_of_uint): Make it more general so that it would
+	work for routes as well.
+
+	* system-settings/plugins/keyfile/writer.c
+	(write_array_of_array_of_uint): Ditto.
+	Fix the netmask/prefix writing.
+
+	* system-settings/plugins/keyfile/plugin.c (add_connection): Return
+	boolean to notify errors.
+
+	* system-settings/plugins/ifcfg-suse/nm-suse-connection.c (update):
+	Return more specific error.
+	(delete): Ditto.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Modify the NMDevice::state-changed signal to include the previous state
+	and reason. Enables the applet to provide more information why device
+	activation failed.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* callouts/Makefile.am
+	  callouts/nm-avahi-autoipd-action.c
+	  callouts/nm-avahi-autoipd.conf
+		- avahi-autoipd callout to send options back to NM
+
+	* src/autoip.c
+	  src/autoip.h
+		- remove
+
+	* src/nm-device.c
+	  src/nm-device-private.h
+	  src/nm-manager.c
+		- Use avahi-autoipd for IPv4LL functionality rather than really crappy
+			old custom stuff
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (make_ip4_setting): handle DHCP_HOSTNAME; fix up prefix support to
+			handle PREFIX too; clean up
+
[phone]  Dan Williams  <[e-mail]>
+
+	Convert to using IPv4 prefixes instead of netmasks.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-ip4-config.c
+	  libnm-util/nm-setting-ip4-config.h
+		- Add properties for DHCP Client Identifier and DHCP Hostname
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+	  src/dhcp-manager/nm-dhcp-manager.h
+		- (nm_dhcp_manager_begin_transaction): take the connection's ip4-config
+			setting as an argument to pass on to the dhclient config file
+			creation function
+		- (nm_dhcp_manager_cancel_transaction_real): remove dhclient config when
+			DHCP is torn down
+		- (dhclient_run): punt config file handling to create_dhclient_config()
+		- (create_dhclient_config): create an interface-specific dhclient
+			config file since there may need to be interface-specific options
+			passed to dhclient
+		- (merge_dhclient_config): merge normal distro dhclient config file and
+			add options from the connection
+		- (nm_dhcp_device_new): generate the interface specific dhclient
+			config file path once
+		- (nm_dhcp_device_destroy): handle partially initialized objects; free
+			dhclient config file path
+
+	* src/nm-device.c
+		- (real_act_stage3_ip_config_start): pass ip4-config, if any, to the
+			DHCP manager when starting DHCP
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-8021x.c
+		- (verify): allow forcing the PEAP label to 0
+
[phone]  Dan Williams  <[e-mail]>
+
+	* introspection/nm-active-connection.xml
+	  introspection/nm-vpn-connection.xml
+	  libnm-glib/nm-active-connection.c
+	  src/nm-activation-request.c
+	  src/nm-active-connection.h
+	  src/vpn-manager/nm-vpn-connection.c
+		- Remove "SharedServiceName" and "SharedConnection" bits from the D-Bus
+			and libnm-glib API since sharing didn't get implemented that way
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-wifi.c
+		- (can_scan): don't scan when a shared connection is activated since
+			that makes drivers mad (causing disconnects); also NM doesn't need
+			to hedge against disconnects by keeping up-to-date network topology
+			because the connection originates from the local machine, and thus
+			there should be no disconnects
+
[phone]  Dan Williams  <[e-mail]>
+
+	Fix mobile broadband username/password issues.  NM was never requesting
+	mobile broadband secrets, nor was it passing back the username and password
+	if it had them.
+
+	* marshallers/nm-marshal.list
+		- Add some new types for activation request objects
+
+	* src/nm-activation-request.c
+	  src/nm-activation-request.h
+		- (get_secrets_cb): pass the caller type in the signal
+		- (nm_act_request_request_connection_secrets): take a caller type, so
+			that GetSecrets() reply handlers know who asked for the secrets in
+			the first place; use secret hints too so the settings service can
+			figure out exactly what NM wants (ie, PIN or the PPP password)
+
+	* src/ppp-manager/nm-ppp-manager.c
+	  src/ppp-manager/nm-ppp-manager.h
+		- (impl_ppp_manager_need_secrets): nm_connection_need_secrets() won't
+			detect needed secrets when the secret could be blank, like GSM/CDMA
+			passwords.  So always ask for secrets, and send a hint as to what
+			secret we really want.
+		- (nm_ppp_manager_update_secrets): make function more generic by making
+			the device specific class figure out the username and password, and
+			accept an error argument to return back over D-Bus
+
+	* src/nm-device-wifi.c
+		- (link_timeout_cb, handle_auth_or_fail): update for changes to
+			nm_act_request_request_connection_secrets()
+		- (real_connection_secrets_updated): update for 'caller' changes
+
+	* src/nm-device.c
+	  src/nm-device.h
+		- (connection_secrets_updated_cb, connection_secrets_failed_cb): update
+			for 'caller' changes
+
+	* src/nm-device-ethernet.c
+		- (real_connection_secrets_updated): update for 'caller' changes and
+			move logic for getting PPPoE username and password here before
+			calling nm_ppp_manager_update_secrets()
+		- (link_timeout_cb, handle_auth_or_fail): update for changes to
+			nm_act_request_request_connection_secrets()
+
+	* src/nm-cdma-device.c
+		- (real_connection_secrets_updated): pass username and password back
+			to the PPP manager when required
+
+	* src/nm-gsm-device.c
+		- (enter_pin): send the required secret name to the settings service
+		- (real_connection_secrets_updated): pass username and password back
+			to the PPP manager when required
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-wifi.c
+		- Consistently use NM_DEVICE_WIFI_GET_PRIVATE instead of self->priv
+
[phone]  Dan Williams  <[e-mail]>
+
+	Attempt to fix various issues causing rh #448889.  Mainly, to qualify for
+	the DISCONNECTED state, the device must not be rfkilled _and_ have a valid
+	priv->supplicant.iface.  When either condition is false, the device should
+	transition back to UNAVAILABLE because it cannot be used.
+
+	* src/nm-device-wifi.c
+		- (constructor): cleanup; connect to supplicant manager here since the
+			supplicant manager is always around
+		- (supplicant_interface_acquire): rename from init_supplicant_interface,
+			ensure the supplicant manager is in the IDLE state
+		- (supplicant_interface_release): rename from cleanup_supplicant_interface,
+			cancel any pending scans too
+		- (real_bring_up): don't set up the supplicnat interface here, because
+			we need the supplicant interface at times when the device may not
+			be "up"
+		- (real_take_down): just remove the periodic source
+		- (schedule_scan): ensure a state that would peg the CPU doesn't happen
+		- (remove_supplicant_interface_connection_error_handler): cleanup; don't
+			do anything if there's no supplicant interface
+		- (cleanup_association_attempt): cleanup
+		- (supplicant_iface_state_cb_handler): request an immediate scan when
+			the interface enters the READY state; transition to UNAVAILABLE
+			state when the interface goes down because the device can't be used
+			without a supplicant interface
+		- (supplicant_mgr_state_cb_handler): if the supplicant goes away, clean
+			up and transition to UNAVAILABLE; if the supplicant becomes ready,
+			acquire the supplicant interface and transition to DISCONNECTED
+			if the radio isn't killed
+		- (nm_device_wifi_dispose): move most of device_cleanup() here
+		- (state_changed_cb): release any existing supplicant interface; if the
+			radio is enabled then try to acquire a new supplicant interface;
+			if the radio is enabled and a supplicant interface has been acquired,
+			we can transition to DISCONNECTED
+		- (nm_device_wifi_set_enabled): if bringing the hardware up failed,
+			don't enable the radio, because HAL probably lied to us about the
+			killswitch being off.  If bringing the hardware up worked, then
+			try to grab a supplicant interface, and if that was successful,
+			transition to DISCONNECTED
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/supplicant-manager/nm-supplicant-interface.c
+		- (request_scan_results, nm_supplicant_interface_dispose,
+		   wpas_iface_query_scan_results): cleanup; scan_results_timeout is now
+			the id of the timeout, not a GSource
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/backends/NetworkManagerSuSE.c (nm_system_activate_nis): Fix a 
+	bunch of typoes introduced by "Patch from David Cantrell 
+	<[e-mail]> and me".
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/nm-serial-device.c: 
+	* src/nm-gsm-device.c: 
+	* src/nm-cdma-device.c: Move the pending call handling to a common location
+	in serial device. Handle setting device state to failed in one place as well.
+
[phone]  Dan Williams <[e-mail]>
+
+	* src/nm-hal-manager.c
+		- Rework killswitch handling to query killswitch status immediately
+			when the first killswitch is added, so that rfkill state is
+			known as early as possible
+		- Also treat failure of GetPower() as rfkill when the dbus method
+			call times out (but not when the HAL callout returns an error)
+
[phone]  Dan Williams <[e-mail]>
+
+	Patch from David Cantrell <[e-mail]> and me
+
+	* include/nm-dbus-glib-types.h
+		- Add IP6 address types
+
+	* libnm-util/Makefile.am
+	  libnm-util/nm-setting-ip6-config.c
+	  libnm-util/nm-setting-ip6-config.h
+		- Add IP6 settings object
+
+	* libnm-util/nm-connection.c
+		- (register_default_settings): register ip6 settings object
+
+	* libnm-util/nm-utils.c
+	  libnm-util/nm-utils.h
+		- (nm_utils_ip6_addresses_from_gvalue, nm_utils_ip6_addresses_to_gvalue,
+		   nm_utils_ip6_dns_from_gvalue, nm_utils_ip6_dns_to_gvalue): add
+			ip6 address conversion functions
+	
[phone]  Dan Williams <[e-mail]>
+
+	Patch from David Cantrell <[e-mail]>
+	
+	* Use inet_ntop() and inet_pton() everwhere and check for errors
+
[phone]  Dan Williams <[e-mail]>
+
+	* Update FSF address in license headers (Michael Biebl <[e-mail]>)
+
[phone]  Dan Williams <[e-mail]>
+
+	Patch from Adel Gadllah <[e-mail]>
+
+	* src/nm-device-wifi.c
+		- (link_timeout_cb): don't ignore disconnects due to scanning
+		- (supplicant_iface_connection_state_cb_handler): instead, schedule
+			a longer timeout when scanning; avoids case where supplicant can't
+			find the AP and just keeps scanning forever but isn't connected
+
[phone]  Dan Williams <[e-mail]>
+
+	Patch from Michael Biebl <[e-mail]>
+
+	* Clean up build system stuff
+
[phone]  Christian Persch  <[e-mail]>
+
+	* vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c:
+	* vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h:
+	* vpn-daemons/pptp/auth-dialog-general/anonymous-auth-module.c:
+	(impl_get_object):
+	* vpn-daemons/pptp/auth-dialog-general/chap-auth-module.c:
+	(impl_get_object):
+	* vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.c:
+	* vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.h:
+	* vpn-daemons/pptp/auth-dialog-general/mschapv2-auth-module.c:
+	(impl_get_object):
+	* vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c:
+	* vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h:
+	* vpn-daemons/pptp/properties/nm-ppp-properties.c: (impl_setup):
+	* vpn-daemons/pptp/properties/vpnui_impl.c: (impl_get_object):
+	* vpn-daemons/pptp/properties/vpnui_opt.c:
+	(vpnui_opt_connect_signals):
+	* vpn-daemons/pptp/properties/vpnui_opt.h:
+	* vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:
+	* vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h: Don't use
+	deprecated gtk type macros. Bug #539325.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-vpn-plugin-ui-interface.c
+	  libnm-glib/nm-vpn-plugin-ui-interface.h
+		- 'validity-changed' -> 'changed' to work better with the connection
+			editor.  Plugin UI widgets should emit 'changed' whenever their
+			UI values change in a meaningful way.
+		- (nm_vpn_plugin_ui_widget_interface_update_connection): the
+			update_connection member now returns validity of the UI widget
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* libnm-util/nm-connection.c (nm_connection_duplicate): Implement.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-vpn-plugin-ui-interface.c
+	  libnm-glib/nm-vpn-plugin-ui-interface.h
+		- Add "desc" property for longer descriptions of the VPN plugin
+
[phone]  Dan Williams  <[e-mail]>
+
+	* configure.in
+	  libnm-glib/libnm_glib_vpn.pc.in
+		- add a .pc file for libnm_glib_vpn
+
+	* libnm-glib/nm-vpn-plugin-ui-interface.c
+	  libnm-glib/nm-vpn-plugin-ui-interface.h
+		- Move the glib/GNOME VPN UI plugin interface into libnm-glib and
+			rework it substantially
+
[phone]  Dan Williams  <[e-mail]>
+
+	Add a GError argument to nm_connection_verify() and nm_setting_verify(),
+	and add error enums to each NMSetting subclass.  Each NMSetting subclass now
+	returns a descriptive GError when verification fails.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* libnm-util/nm-setting-gsm.c
+		- (verify): validate APN
+
+	* src/nm-gsm-device.c
+		- (manual_registration_done): start setting APN if needed
+		- (set_apn, set_apn_done): set the APN
+		- (do_dial): use the APN when dialing
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+		- (nm_system_device_set_ip4_route,
+		   nm_system_device_replace_default_ip4_route): check for the right
+			return value from rtnl_route_add() to know when to add a gateway
+			route (from Tambet)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- do_ipt_cmd -> do_cmd
+		- (sharing_init): use do_cmd() instead of system()
+
[phone]  Dan Williams  <[e-mail]>
+
+	The grand 802-11-wireless rename.  Get rid of the 802-11/80211/802_11 bits
+	and use "wifi" everwhere instead.
+
[phone]  Dan Williams  <[e-mail]>
+
+	The grand 802-3-ethernet rename.  Get rid of the 802-3/8023/802_3 bits.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Tambet Ingo <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c: Add ppp stats monitoring, signal the
+		changes.
+
+	* src/nm-serial-device.c: Monitor "ppp-stats" signals from NMPPPManager. Add
+		a signal to emit these changes over dbus.
+
+	* src/Makefile.am: Genereate nm-serial-device-glue.
+
+	* libnm-glib/nm-serial-device.[ch]: Implement.
+
+	* libnm-glib/nm-cdma-device.[ch]
+	  libnm-glib/nm-gsm-device.[ch]: Inherit from NMSerialDevice.
+
+	* libnm-glib/Makefile.am: Add nm-serial-device.[ch].
+
+	* introspection/nm-device-serial.xml: Implement.
+
+	* introspection/all.xml: Fix a couple of typos, add nm-device-serial.xml.
+
+	* introspection/Makefile.am: Add nm-device-serial.xml.
+
+	* include/NetworkManager.h: Add a DBus interface for serial device.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* configure.in
+		- Add TARGET_* define to config.h to distinguish distros
+
+	* src/dhcp-manager/nm-dhcp-manager.c
+		- (dhclient_run): use distro-specific path for dhclient config file
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/dnsmasq-manager/nm-dnsmasq-manager.c
+	  src/dnsmasq-manager/nm-dnsmasq-manager.h
+		- (create_dm_cmd_line): use the IP4 address of the ip4-config to
+			calculate the addresses passed to dnsmasq instead of hard-coding
+			them
+
+	* src/nm-device.c
+		- (nm_device_new_ip4_shared_config): be somewhat dynamic when choosing
+			IP addresses for shared connections to guard against shared
+			connection address collisions
+		- (real_act_stage4_get_ip4_config): handle possible NULL ip4-configs on
+			error conditions
+		- (nm_device_activate_stage5_ip_config_commit): pass ip4-config to
+			the dnsmasq manager
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/NetworkManagerPolicy.c
+		- (update_routing_and_dns): set the default connection _after_ unsetting
+			default on all non-default connections so that two connections can
+			never be default at the same time
+		- (device_state_changed): start and stop connection sharing when
+			needed
+		- (active_connection_default_changed): restart or stop sharing when
+			the default connection changes to keep shared connections always
+			NAT-ed through the default connection
+		- (check_sharing): handle activation/deactivation of shared connections
+		- (sharing_restart): atom-bomb approach to connection sharing until we
+			can use libnl; reinit all sharing when the default connection or
+			shared connections change
+		- (sharing_init, sharing_stop): evil functions that init and deinit
+			iptables
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-activation-request.c
+	  src/nm-activation-request.h
+		- (nm_act_request_set_shared, nm_act_request_get_shared,
+		   nm_act_request_get_device): new functions to facilitate connection
+			sharing
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device.c
+		- (clear_act_request): unset the 'default' property of the activation
+			request when clearing it to ensure the property changed signal gets
+			delivered and handled
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-glib/nm-device-802-11-wireless.c
+		- (access_point_removed_proxy): actually unref the AP after removing
+			it from the device's AP list.  Fixes refcounting bug for APs that
+			caused them to get mixed up in the applet's menu.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/dhcp-manager/nm-dhcp-manager.c (finalize): Free private members.
+	(nm_dhcp_device_destroy): Destroy the device options hash table.
+
[phone]  Dan Williams <[e-mail]>
+
+	* system-settings/src/nm-polkit-helpers.c
+		- (create_polkit_context): in PolicyKit 0.6, polkit_context_init() will
+			unref the context if the initialization fails; also avoid spew when
+			the error isn't set
+
[phone]  Dan Williams <[e-mail]>
+
+	Patch from Tambet Ingo  <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+	  src/NetworkManagerSystem.h
+		- (nm_system_device_add_ip4_route_via_device_with_iface): remove
+		- (nm_system_device_set_from_ip4_config): remove unused route_to_iface
+		- (nm_system_device_set_ip4_route): clean up
+		- (nm_system_vpn_device_set_from_ip4_config): clean up, add VPN routes
+
+	* src/nm-device.c
+		- (nm_device_set_ip4_config): remove unused route_to_iface bits
+
+	* src/vpn-manager/nm-vpn-connection.c
+		- (ip_address_to_string): new function
+		- (print_vpn_config): use ip_address_to_string
+		- (merge_vpn_routes): add user-defined routes to the ip4 config
+		- (nm_vpn_connection_ip4_config_get): add routes the VPN server sent
+
+	* include/NetworkManagerVPN.h
+		- Add 'routes' key
+
[phone]  Dan Williams <[e-mail]>
+
+	Patch from Markus Becker <[e-mail]>
+
+	* test/nm-tool.c
+		- Show which device is the default device
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	Fix memory leaks.
+
+	* system-settings/src/nm-system-config-hal-manager.c (get_type_for_udi):
+	Free data returned from dbus method call.
+
+	* system-settings/src/nm-polkit-helpers.c (check_polkit_privileges):
+	dbus_g_method_get_sender() returns a duplicated string, free it 
+	when done.
+	(check_polkit_privileges): Looks like policykit sometimes returns
+	error and non-null return value, don't leak errors in that case.
+
+	* system-settings/src/main.c (find_plugin): Don't leak existing 
+	plugin names.
+	(load_stuff): Don't leak device list and list items.
+	(have_connection_for_device): Don't leak connection list.
+
+	* system-settings/plugins/keyfile/reader.c (read_one_setting_value):
+	Free the data received from g_keyfile_get_*.
+
+	* system-settings/plugins/ifcfg-suse/parser.c (READ_WEP_KEY): Free
+	the key when the security object is updated.
+
+	* src/supplicant-manager/nm-supplicant-interface.c (scan_results_cb):
+	Free data returned from dbus method call.
+	(iface_state_cb): Ditto.
+	(add_network_cb): Ditto.
+	(nm_supplicant_interface_add_cb): Don't make another copy of already
+	duplicated object path.
+	(nm_supplicant_interface_add_to_supplicant): Free the driver GValue
+	when done.
+
+	* src/supplicant-manager/nm-supplicant-config.c 
+	(ADD_STRING_LIST_VAL): Fix a memory leak.
+
+	* src/nm-manager.c (free_get_settings_info): Free the allocated
+	memory slice.
+	(list_connections_cb): Free data returned from dbus method call.
+	(system_settings_get_unmanaged_devices_cb): Ditto.
+
+	* src/nm-device-802-11-wireless.c (device_cleanup): Free ssid.
+
+	* system-settings/plugins/ifcfg-suse/shvar.c (svCloseFile): 
+	* system-settings/plugins/ifcfg-fedora/shvar.c (svCloseFile): 
+	* src/backends/shvar.c (svCloseFile): Free the duplicated content
+	of the GList.
+
+	* libnm-util/nm-setting.c (nm_setting_from_hash): Free the constructor
+	arguments after the object is created.
+
[phone]  Dan Williams <[e-mail]>
+
+	* libnm-util/Makefile.am
+		- Don't distribute nm-param-spec-specialized.h
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* libnm-util/nm-setting-ip4-config.[ch]: Add static routes property.
+
+	* src/nm-ip4-config.[ch]: Store the static routes as a list of
+	NMIP4Address, update the getters and setters.
+
+	* src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get_ip4_config):
+	Use the updated NMIP4Config routes api.
+
+	* src/NetworkManagerUtils.c (nm_utils_merge_ip4_config): Merge
+	static routes as well.
+
+	* src/NetworkManagerSystem.c (netmask_to_prefix): Implement.
+	(nm_system_device_set_from_ip4_config): Use the updated NMIP4Config
+	routes api.
+
[phone]  Dan Williams <[e-mail]>
+
+	* src/named-manager/nm-named-manager.c
+	  src/named-manager/nm-named-manager.h
+		- Remove stale/obsolete bits for controlling bind over DBus
+
[phone]  Dan Williams <[e-mail]>
+
+	* src/dnsmasq-manager/nm-dnsmasq-manager.c
+	  src/dnsmasq-manager/nm-dnsmasq-manager.h
+		- (nm_dnsmasq_manager_new): move iface argument here
+		- (constructor): remove, not needed
+		- (get_pidfile_for_iface, create_dm_cmd_line, kill_existing_for_iface,
+		   nm_dnsmasq_manager_start, nm_dnsmasq_manager_stop): use priv->pidfile
+
+	* src/nm-device.c
+		- (real_act_stage4_get_ip4_config,
+		   nm_device_activate_stage5_ip_config_commit): fix for dnsmasq manager
+			changes
+
[phone]  Dan Williams <[e-mail]>
+
+	* src/nm-device.c
+		- (dnsmasq_state_changed_cb): new function; fail the connection if
+			something happens to dnsmasq
+		- (nm_device_new_ip4_shared_config): new function; create a new
+			ip4-config for shared connections.  Shared connections always use a
+			fixed static IP address.
+		- (real_act_stage4_get_ip4_config): handle shared connections; fix
+			autoip connections by actually using the returned ip4-config and
+			not leaking it
+		- (nm_device_activate_stage5_ip_config_commit): start dnsmasq for shared
+			connections
+		- (nm_device_deactivate_quickly, nm_device_dispose): terminate dnsmasq
+			if its active
+
[phone]  Dan Williams <[e-mail]>
+
+	* src/nm-device-802-11-wireless.c
+		- (real_get_best_auto_connection): auto-activate 'shared' method
+			connections too
+
[phone]  Dan Williams <[e-mail]>
+
+	* libnm-util/nm-setting-ip4-config.c
+	  libnm-util/nm-setting-ip4-config.h
+		- Add a 'shared' method to indicate that this connection should be
+			brought up with a DHCP and proxy DNS server to facilitate
+			connection sharing.
+		- (verify): 'shared' method doesn't allow DNS or searches either
+
[phone]  Dan Williams <[e-mail]>
+
+	* configure.in
+	  src/Makefile.am
+	  src/dnsmasq-manager/Makefile.am
+	  src/dnsmasq-manager/nm-dnsmasq-manager.c
+	  src/dnsmasq-manager/nm-dnsmasq-manager.h
+		- Add a dnsmasq daemon manager to facilitate connection sharing
+
[phone]  Dan Williams <[e-mail]>
+
+	* src/nm-device-private.h
+		- Remove unused prototypes and clean up
+
+	* src/nm-device.c
+		- Remove anything related to system_config_data, which is no longer used
+		- (nm_device_new_ip4_autoip_config): make static
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-suse/nm-suse-connection.c
+	(file_changed): Fix a bug where suse system settings plugin didn't
+	update the connections automatically when the files changed.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Revert r3697 (adhoc-create property patch); it's the wrong way to do this.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Benoit Boissinot <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+		- (nm_system_device_flush_ip4_routes_with_iface): implement with libnl
+		- (nm_system_vpn_device_set_from_ip4_config): don't flush routes here,
+			was causing -EINVAL errors since the libnl code actually does flush
+			the routes on VPN interfaces now
+
+	* src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGeneric.c
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+		- (nm_system_device_flush_ip4_routes,
+		   nm_system_device_flush_ip4_routes_with_iface): remove
+
[phone]  Dan Williams  <[e-mail]>
+
+	* libnm-util/nm-setting-wireless.c
+	  libnm-util/nm-setting-wireless.h
+		- (set_property, get_property, nm_setting_wireless_class_init): add the
+			'adhoc-create' property, which when TRUE indicates that NM should
+			create this connection as an adhoc wifi network if it's not found
+			as an adhoc network during scanning.  Can be used to auto-create
+			adhoc networks when used in combination with autoconnect.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	Patch from Dennis Noordsij <[e-mail]>.
+
+	* src/nm-gsm-device.c: Don't try to reset the modem before PIN is
+	checked, it doesn't work on some devices.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Make sure 
+	pppd gets killed, if SIGTERM doesn't do it's job, SIGKILL it.
+
+	* src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get_ip4_config):
+	Use inet_aton() everywhere to improve error detection.
+	Don't fall back to 'dhcp_server_identifier' if the gateway is not
+	provided.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-suse/plugin.c (get_unamanged_devices_cb):
+	Fix a typo.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/vpn-manager/nm-vpn-manager.c (nm_vpn_manager_get_service): Fix a
+	reference counting issue.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Benoit Boissinot <[e-mail]>
+
+	* src/backends/NetworkManagerGeneric.c
+		- (nm_generic_enable_loopback): use libnl
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Benoit Boissinot <[e-mail]>
+
+	* src/NetworkManagerSystem.h
+	  src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+		- (nm_system_device_has_active_routes, nm_system_flush_loopback_routes,
+		   nm_system_flush_arp_cache): remove, unused
+
+	* src/backends/NetworkManagerGeneric.c
+	  src/backends/NetworkManagerGeneric.h
+		- (nm_generic_device_has_active_routes, nm_generic_flush_loopback_routes,
+		   nm_generic_flush_arp_cache): remove, unused
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (make_ip4_setting): honor PEERDNS setting
+
[phone]  Dan Williams  <[e-mail]>
+
+	Patch from Benoit Boissinot <[e-mail]>
+
+	* src/NetworkManagerSystem.c
+		- (nm_system_device_flush_ip4_addresses_with_iface): implement with
+			libnl
+
+	* src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+		- (nm_system_device_flush_ip4_addresses,
+		   nm_system_device_flush_ip4_addresses_with_iface): remove
+
+	* src/backends/NetworkManagerGeneric.c
+		- (nm_generic_device_flush_ip4_addresses,
+		   nm_generic_device_flush_ip4_addresses_with_iface): remove
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/supplicant-manager/nm-supplicant-settings-verify.c
+		- Switch 'bssid' from bytes to keyword type
+		- (validate_type_keyword): allow NULL keyword lists
+
+	* src/supplicant-manager/nm-supplicant-config.c
+		- (nm_supplicant_config_add_setting_wireless): convert the bssid from
+			a byte array to string form, which is what the supplicant expects
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	Add a flag to NMSettingIP4Config to make it possible to ignore the DNS
+	information received from DHCP.
+
+	* libnm-util/nm-setting-ip4-config.c: Add a new membet "ignore_dhcp_dns"
+	to make it possible to ignore the DNS information (both servers and 
+	searches) returned by DHCP server.
+
+	* src/NetworkManagerUtils.c (nm_utils_merge_ip4_config): Reset the
+	name servers and searches if "ignore_dhcp_dns" is set.
+
+	* src/nm-ip4-config.c (nm_ip4_config_reset_nameservers)
+	(nm_ip4_config_reset_searches): Implement.
+
[phone]  Dan Williams  <[e-mail]>
+
+	Remove anything mDNS related.  This is better done from a distro-specific
+	dispatcher script.  Plus, any distro using avahi doesn't need to restart
+	avahi, since avahi can handle interface changes just fine using netlink.
+
+	* configure.in
+		- Remove --with-mdns-provider
+
+	* src/NetworkManagerPolicy.c
+		- (global_state_changed): don't restart the mdns provider
+
+	* src/NetworkManagerSystem.h
+	  src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+		- (nm_system_restart_mdns_responder): remove
+
+	* src/backends/NetworkManagerGeneric.c
+	  src/backends/NetworkManagerGeneric.h
+		- (nm_generic_restart_mdns_responder): remove
+
[phone]  Dan Williams  <[e-mail]>
+
+	* configure.in
+		- clean up crypto options; just use --with-crypto=nss or
+			--with-crypto=gnutls
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/nm-manager.c (impl_manager_sleep): No need to schedule the sync
+	anymore, do it right away.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/nm-gsm-device.c (device_state_changed): Make sure we don't leave the
+	serial device open when we're not connecting or connected.
+
+	* src/nm-cdma-device.c (device_state_changed): Ditto.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	Don't remove all devices on waking up, sync with HAL.
+
+	* src/nm-manager.c (nm_manager_udi_is_managed): Implement.
+	(sync_devices): Implement, based on hal_manager_hal_reappeared_cb.
+	(hal_manager_hal_reappeared_cb): Just call sync_devices.
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	* src/NetworkManagerSystem.c (nm_system_device_replace_default_ip4_route):
+	If the default gateway is unreachable, add a route to gateway and try
+	again.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (add_one_wep_key): handle ASCII WEP keys too (rh #293111)
+
[phone]  Dan Williams  <[e-mail]>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (make_ip4_setting): get a fallback gateway from /etc/sysconfig/network
+			if the ifcfg doesn't specify one (rh #446527)
+
[phone]  Dan Williams  <[e-mail]>
+
+	Make the system settings service exit when the bus goes away.  Since it's
+	a bus-activated service, it's lifetime is limited to the bus that activated
+	it (rh #444976).
+
+	* system-settings/src/Makefile.am
+	  system-settings/src/nm-system-config-hal-manager-private.h
+		- Remove nm-system-config-hal-manager-private.h
+
+	* system-settings/src/nm-system-config-hal-manager.c
+		- (nm_system_config_hal_manager_reinit_dbus,
+		   nm_system_config_hal_manager_deinit_dbus): remove
+
+	* system-settings/src/main.c
+		- (dbus_reconnect): remove
+		- (dbus_cleanup): don't tell the HAL manager to deinit dbus
+		- (destroy_cb): just quit when the bus goes away
+		- (start_dbus_service, dbus_init): simplify
+		- (main): destroy the wired devices hash table after destroying
+			the HAL manager so we don't have to disconnect signals from the
+			HAL manager
+
[phone]  Tambet Ingo  <[e-mail]>
+
+	Move crypto functions from nm-applet to libnm-util.
+
+	* libnm-util/nm-setting-8021x.c (nm_setting_802_1x_set_ca_cert)
+	(nm_setting_802_1x_set_client_cert)
+	(nm_setting_802_1x_set_phase2_ca_cert)
+	(nm_setting_802_1x_set_phase2_client_cert)
+	(nm_setting_802_1x_set_private_key)
+	(nm_setting_802_1x_set_phase2_private_key): Implement. Given a certificate
+	file (or private key and it's password), read the certificate data.
+
+	* libnm-util/crypto_nss.c: 
+	* libnm-util/crypto_gnutls.c: 
+	* libnm-util/crypto.[ch]: Move here from nm-applet.
+
+	* configure.in: Check for NSS and gnutls here (moved here from nm-applet).
+
+	* system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings):
+	Imlement WPA-EAP configuration reading from sysconfig.
+
[phone]  Dan Williams  <[e-mail]>
+
+	* src/nm-device-802-11-wireless.c
+		- (nm_device_802_11_wireless_set_enabled): request a scan after enabling
+			wireless
+
[phone]  Dan Williams  <[e-mail]>
+
+	Fix Linus' bug in rh #134886
+
+	* src/nm-device-802-3-ethernet.c
+		- (constructor): request initial carrier state