Merge branch 'master' into firmwareobsolete-20140117

Conflicts:
	NEWS
	core/fs/fs.c
	version

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2 files changed, 9 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 79d09cc5..6468951d 100644
--- a/NEWS
+++ b/NEWS
@@ -106,6 +106,14 @@ Changes in 5.00:
 	  COMBOOT files (.cbt and .com) are no longer supported under
 	  Syslinux.
 
+Changes in 4.07:
+	* EXTLINUX: fix crash caused by dereferencing garbage pointer.
+	* Plug memory leak in searchdir which eventually leads to an
+	  observable hang (Shao Miller).
+	* ISOLINUX: fix bug triggered by isohybrid images larger than
+	  32K which results in an invalid image checksum error.
+	* menugen: make it Py3k compatible (Paulo Alcantara).
+
 Changes in 4.06:
 	* Support for NTFS, by Paulo Alcantara.
 	* EXTLINUX: more robust device detection, allow user to override.
diff --git a/version b/version
index 42678b77..c4f32f07 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-6.03 2013
+6.03 2014