Git merges in Moodle 1.9.12 by Sam Hemelryk

commit 032be8a19bf424ba993133c4beabe752d5345d74
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:31:38 +0800
Tag:    v1.9.12

Merge branch 'MDL-26130' of git://github.com/MaryE/moodle into MOODLE_19_STABLE