Merge remote branch 'origin/ip6only'
authorDan Williams <dcbw@redhat.com>
Tue, 27 Apr 2010 00:33:45 +0000 (17:33 -0700)
committerDan Williams <dcbw@redhat.com>
Tue, 27 Apr 2010 00:33:45 +0000 (17:33 -0700)
1  2 
src/named-manager/nm-named-manager.c
src/nm-udev-manager.c

Simple merge
Simple merge