Merge bleeding_edge from version 2.1.3 up to revision 4205...

src/counters.h

Index: src/counters.h
===================================================================
--- src/counters.h	(revision 4205)
+++ src/counters.h	(working copy)
@@ -65,7 +65,7 @@
   // may receive a different location to store it's counter.
   // The return value must not be cached and re-used across
   // threads, although a single thread is free to cache it.
-  static int *FindLocation(const char* name) {
+  static int* FindLocation(const char* name) {
     if (!lookup_function_) return NULL;
     return lookup_function_(name);
   }