MERGE 156 B

12345
  1. 883bc6ed0ea815293fe6309d66f967ea60630e87
  2. The first line of this file holds the git revision number of the
  3. last merge done from the master library sources.