Merge commit 'org/master' into ded-org-src
commit6ab0d43e80d73a8f99a7c35117e512e2e0573573
authorDan Davison <davison@stats.ox.ac.uk>
Thu, 15 Oct 2009 14:32:09 +0000 (15 10:32 -0400)
committerDan Davison <davison@stats.ox.ac.uk>
Thu, 15 Oct 2009 14:32:09 +0000 (15 10:32 -0400)
tree3788be257ce32756e1c40bae7972d62df10ca9b0
parent8bd1eb5d4b2daa8b9bb50ec5c3917ea302a347c4
parent93f3968e3f6cb5bf29a2d089457676c5b4a7b694
Merge commit 'org/master' into ded-org-src