Merge remote branch 'origin/master' into rm-userset
authorDan Williams <dcbw@redhat.com>
Wed, 17 Nov 2010 00:08:48 +0000 (18:08 -0600)
committerDan Williams <dcbw@redhat.com>
Wed, 17 Nov 2010 00:08:48 +0000 (18:08 -0600)
commitcfaa80b261d3b77a2e0d502479bbd300763268a0
tree7c19c2219f0b19358672a702e1f24441621fc227
parent8f699a77f2e4d825aa73c9c794637cf504a3e9b2
parent568f5e073be31fdf357a4ab4a484d57e9559f29b
Merge remote branch 'origin/master' into rm-userset
configure.ac
po/cs.po
po/lt.po
src/Makefile.am
src/nm-manager.c
src/nm-policy.c
system-settings/plugins/ifcfg-rh/plugin.c
system-settings/plugins/keyfile/Makefile.am
system-settings/plugins/keyfile/plugin.c