Automerging change r10425 from trunk to branches/8.2.0
------------------------------------------------------------------------ r10425 | yaberauneya | 2012-03-02 23:28:34 -0800 (Fri, 02 Mar 2012) | 1 line
iSCSI initiator network should be a CharField
Authored by: yaberauneya 2012-03-03
Parent: [r10440]
Child: [r10442]