Merge branch 'iscsi'
authorDan Williams <dcbw@redhat.com>
Mon, 10 Aug 2009 20:52:28 +0000 (15:52 -0500)
committerDan Williams <dcbw@redhat.com>
Mon, 10 Aug 2009 20:52:28 +0000 (15:52 -0500)
1  2 
include/NetworkManager.h
src/nm-manager.c

Simple merge
Simple merge