Git merges in Moodle 2.0.x by Moodle HQ git importer

commit d4f7385de7fd1d988387952930e958107eef8040
Author: Moodle HQ git importer <gitimport@server2.moodle.com>
Date:   Thu, 17 Dec 2009 13:56:30 +0800
Tag:    v2.0.0-rc1

Merge branch 'cvshead' of /git/import/moodle into cvshead


commit 2ce3543c8a792c9d9bde24237088b369ec00403c
Author: Moodle HQ git importer <gitimport@server2.moodle.com>
Date:   Thu, 17 Dec 2009 13:38:06 +0800
Tag:    v2.0.0-rc1

Merge branch 'cvshead' of /git/import/moodle into cvshead