Git merges in Moodle 2.0.5 by Petr Skoda

commit 7431abde3caa66a30639e148af720971ac5fa5cb
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 16 Aug 2011 02:26:19 +0800
Tag:    v2.0.5

Merge branch 'MDL-28465_rating_aggregation_split' into MOODLE_20_STABLE

commit b8a5c64e95ba8096bb0c063f34afde51ab21ed09
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 02 Aug 2011 21:14:00 +0800
Tag:    v2.0.5

Merge branch 'wip-mdl-27658-m20' of git://github.com/rajeshtaneja/moodle into MOODLE_20_STABLE