Merge patch in revision 6359 to trunk.

src/preparse-data.h

Index: src/preparse-data.h
diff --git a/src/preparse-data.h b/src/preparse-data.h
index cc82bcc62c0cf3cbce4016a621ca4a2f1e2cbfcc..bb5707b61dfe5f234ed5ff6232e84cc133d7b9fd 100644
--- a/src/preparse-data.h
+++ b/src/preparse-data.h
@@ -39,7 +39,7 @@ class PreparseDataConstants : public AllStatic {
  public:
   // Layout and constants of the preparse data exchange format.
   static const unsigned kMagicNumber = 0xBadDead;
-  static const unsigned kCurrentVersion = 5;
+  static const unsigned kCurrentVersion = 6;
 
   static const int kMagicOffset = 0;
   static const int kVersionOffset = 1;