bzr push into mysql-5.5-cluster-7.2 branch (mauritz.sundell:4105 to 4106)

[Mauritz Sundell]

 4106 Mauritz Sundell	2012-11-22 [merge]
      merge 7.1 -> 7.2

    modified:
      storage/ndb/include/ndbapi/Ndb.hpp
 4105 magnus.blaudd@stripped	2012-11-22 [merge]
      Null merge 7.1(unrm of have_junit.inc) -> 7.2

=== modified file 'storage/ndb/include/ndbapi/Ndb.hpp'
--- a/storage/ndb/include/ndbapi/Ndb.hpp	2012-06-11 14:57:25 +0000
+++ b/storage/ndb/include/ndbapi/Ndb.hpp	2012-11-22 09:49:26 +0000
@@ -2064,6 +2064,11 @@ private:
 #endif
 
 #ifdef VM_TRACE
+/**
+ * my_attribute.h need GCC_VERSION defined from my_global.h,
+ * otherwise it will redefine __attribute__
+ */
+#include <my_global.h>
 #include <my_attribute.h>
   void printState(const char* fmt, ...)
     ATTRIBUTE_FORMAT(printf, 2, 3);

No bundle (reason: useless for push emails).