Wed, 19 Feb 2014 22:27:11 +0100Merge
Edouard Tisserant [Wed, 19 Feb 2014 22:27:11 +0100] rev 870
Merge

Sun, 16 Feb 2014 14:29:31 +0000fix definition of pragma.
mjsousa [Sun, 16 Feb 2014 14:29:31 +0000] rev 869
fix definition of pragma.