Merge commit 'origin/master' into btdun
authorDan Williams <dcbw@redhat.com>
Tue, 20 Oct 2009 19:12:08 +0000 (12:12 -0700)
committerDan Williams <dcbw@redhat.com>
Tue, 20 Oct 2009 19:12:08 +0000 (12:12 -0700)
commit2d9ecfccd8d5c185c4f74d9f0d42ed58b9f6f24d
treee0df653317d0070e79e36e966065fe656813e7c0
parent093b86a8c711411d437b17689343d1d86a613e1a
parentc9d2d977dd1ec6b882a7975c8c6f160096e2e9ce
Merge commit 'origin/master' into btdun
src/nm-manager.c