Merge remote branch 'origin/dhcp6'
authorDan Williams <dcbw@redhat.com>
Thu, 18 Feb 2010 18:17:47 +0000 (10:17 -0800)
committerDan Williams <dcbw@redhat.com>
Thu, 18 Feb 2010 18:17:47 +0000 (10:17 -0800)
1  2 
configure.ac

diff --cc configure.ac
Simple merge