Merge remote branch 'remotes/fransesc/compiler_directives'
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 8 Apr 2011 00:24:19 +0000 (17:24 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 8 Apr 2011 00:24:19 +0000 (17:24 -0700)
Conflicts:
docs/src/reference/compilation.rst


Trivial merge