Git merges in Moodle 2.2.2 by AMOS bot

commit c56a8d44414257f1a4f017584b4c4288ef5aacab
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 08 Jan 2012 08:31:21 +0800
Tag:    v2.2.2

Merge branch 'MOODLE_22_STABLE' into install_22_STABLE