Merge remote branch 'origin/master' into ip6only
authorDan Williams <dcbw@redhat.com>
Thu, 22 Apr 2010 21:20:24 +0000 (14:20 -0700)
committerDan Williams <dcbw@redhat.com>
Thu, 22 Apr 2010 21:20:24 +0000 (14:20 -0700)
commiteafb1a6725c60243f9cd4135fd642039e7bf732a
treee4838a69176eb036536fc398f755cdea7090c9a4
parent2ce8028e10ab2780dcd7970674ba18dc0772595a
parent5a9b7b42d176c2340e146a3e76adfb7d142e02c4
Merge remote branch 'origin/master' into ip6only
libnm-glib/libnm-glib.ver