Git merges in Moodle 1.9.17 by Sam Hemelryk

commit 7eb1327487c542f24700c4edb5035ceca7f2989d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Feb 2012 12:34:09 +0800
Tag:    v1.9.17

Merge branch 'wip-MDL-25185-MOODLE_19_STABLE' of git://github.com/abgreeve/moodle into MOODLE_19_STABLE