Merge remote branch 'origin/master' into ip6only
authorDan Williams <dcbw@redhat.com>
Fri, 23 Apr 2010 19:13:24 +0000 (12:13 -0700)
committerDan Williams <dcbw@redhat.com>
Fri, 23 Apr 2010 19:13:24 +0000 (12:13 -0700)
1  2 
src/nm-manager.c

Simple merge