Merge lp:~ubuntu-branches/ubuntu/maverick/open-iscsi/maverick-201007021711 into lp:ubuntu/maverick/open-iscsi

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/open-iscsi now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/open-iscsi/maverick-201007021711. A merge should be performed if necessary.

Unmerged revisions

31. By Colin Watson on 2010-07-02

Include <sys/types.h> and <sys/stat.h> in usr/iscsi_sysfs.c for S_*
macros (LP: #600953).

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-02 17:08:14 +0000
+++ debian/changelog	2010-07-02 17:15:39 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 open-iscsi (2.0.871-0ubuntu5) maverick; urgency=low
 
   * Include <sys/types.h> and <sys/stat.h> in usr/iscsi_sysfs.c for S_*
@@ -5,6 +6,15 @@
 
  -- Colin Watson <[e-mail]>  Fri, 02 Jul 2010 17:08:14 +0100
 
+=======
+open-iscsi (2.0.871-0ubuntu5) UNRELEASED; urgency=low
+
+  * Include <sys/types.h> and <sys/stat.h> in usr/iscsi_sysfs.c for S_*
+    macros (LP: #600953).
+
+ -- Colin Watson <[e-mail]>  Fri, 02 Jul 2010 16:10:32 +0100
+
+>>>>>>> MERGE-SOURCE
 open-iscsi (2.0.871-0ubuntu4) lucid; urgency=low
 
   * Revert ISCSI_NETDEVICE change; it's normally better to select the