Git merges in Moodle 2.1.0 by Dan Marsden

commit 4f6e39db5e8178ea1d5219e8652455b174c98b0b
Author: Dan Marsden <dan@catalyst.net.nz>
Date:   Thu, 14 Apr 2011 05:15:48 +0800
Tag:    v2.1.0

Merge remote branch 'moodle/master' into master_MDL-18392_slash_cleanup