diff --git a/[refs] b/[refs]
index 0c196968d660..44cf6937bc6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5a4630a0daad241c761064295958554472ed491
+refs/heads/master: 7088655477b51a5a248fa54190388e1283ba7ebf
diff --git a/trunk/.gitignore b/trunk/.gitignore
index 8363e48cdcdc..fdcce40226d7 100644
--- a/trunk/.gitignore
+++ b/trunk/.gitignore
@@ -53,3 +53,5 @@ cscope.*
 
 *.orig
 *.rej
+*~
+\#*#