Git merges in Moodle 2.1.7 by AMOS bot

commit b53489190daab71c05e2135a7191a1811144c89a
Author: AMOS bot <amos@moodle.org>
Date:   Tue, 26 Jun 2012 08:31:34 +0800
Tag:    v2.1.7

Merge branch 'MOODLE_21_STABLE' into install_21_STABLE