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)
1  2 
src/nm-manager.c

Simple merge