Merge branch 'MDL-26158'
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 04:09:53 +0000 (12:09 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 04:09:53 +0000 (12:09 +0800)

Trivial merge