Merge branch 'MDL-25907_wip'
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:53:24 +0000 (10:53 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 02:53:24 +0000 (10:53 +0800)

Trivial merge