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)
commit38f732a721955ffc66bb5c679c8302c499d20a62
tree786f34a7bae88f429f3872efa44de00cf51024c6
parent0993ea398951df26eb961e7ca0ac386ed374022d
parent1d5a68db74a1e86155be9879a62fb1cbb86291ea
Merge branch 'iscsi'
include/NetworkManager.h
src/nm-manager.c