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)
commit95d13537adbae2b2e3357ebd639cd912162f7fe9
tree2f53bd7d5a62ef6d99b6f556160691e53c443a52
parent19277ba553616669f30d20e1f4cbffedd02f0ec2
parentc426cdcd698cda654e9beb21687fa4a656050575
Merge remote branch 'remotes/fransesc/compiler_directives'

Conflicts:
docs/src/reference/compilation.rst