Git merges in Moodle 2.0.5 by AMOS bot

commit 953560c9c4b2b349e9458787fa6bbd6c93cfa9ff
Author: AMOS bot <amosbot@host4.mediatouch.it>
Date:   Mon, 26 Sep 2011 08:55:37 +0800
Tag:    v2.0.5

Merge branch 'MOODLE_20_STABLE' into install_20_STABLE