Git merges in Moodle 2.0.10 by AMOS bot

commit 335ded3169e0a70c66f7c6477851f65d54106187
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 26 Jun 2012 08:31:48 +0800
Tag:    v2.0.10

Merge branch 'MOODLE_20_STABLE' into install_20_STABLE