diff --git a/[refs] b/[refs]
index e96e3ecc2cd6..7846f73b25fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33af79d12e0fa25545d49e86afc67ea8ad5f2f40
+refs/heads/master: 7023cc61292f9cd61d99521206480f6e387132ff
diff --git a/trunk/Makefile b/trunk/Makefile
index 1564577bdc53..6192922de9c0 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,4 +1,3 @@
-FRED=42
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 26