Git commits in Moodle 1.9.12 by Sam Hemelryk

commit 5b2d591bcb65f124620c2b444aaba93aeb96a68d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:36:29 +0800
Tag:    v1.9.12

Cherry-picked changes for PULL-460/MDL-26557 into MOODLE_19_STABLE