diff --git a/[refs] b/[refs]
index 35f31c3f7241..da0dc1a009e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 003086497f07f7f1e67c0c295e261740f822b377
+refs/heads/master: 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84
diff --git a/trunk/Makefile b/trunk/Makefile
index 210107d3aa97..1ab3ebfc9091 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc8
-NAME = Erotic Pickled Herring
+EXTRAVERSION =
+NAME = Temporary Tasmanian Devil
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"