Git merges in Moodle 2.2.0 by AMOS bot

commit 967bc47c80346cf6280f2a1385fc50df926cde36
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 19 Nov 2011 08:30:59 +0800
Tag:    v2.2.0-rc1

Merge branch 'master' into install_master

commit 15218d81838acf90f3e15e886f4e0c81b8abaf23
Author: AMOS bot <amosbot@host4.mediatouch.it>
Date:   Mon, 26 Sep 2011 08:55:27 +0800
Tag:    v2.2.0-beta

Merge branch 'master' into install_master