Merge branch 'iscsi'
authorRobin H. Johnson <robbat2@gentoo.org>
Thu, 12 Nov 2009 23:07:12 +0000 (23:07 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Thu, 12 Nov 2009 23:07:12 +0000 (23:07 +0000)

Trivial merge