Git merges in Moodle 2.1.2 by AMOS bot

commit 9d7b02bec08b0eaf19b9b3271be028c45471dcd9
Author: AMOS bot <amosbot@host4.mediatouch.it>
Date:   Mon, 26 Sep 2011 08:55:32 +0800
Tag:    v2.1.2

Merge branch 'MOODLE_21_STABLE' into install_21_STABLE