Git merges in Moodle 2.1.x by Rajesh Taneja

commit b4e29077d3c00f3b25ed90a75cf23c97a5823119
Author: Rajesh Taneja <rajesh@moodle.org>
Date:   Tue, 14 Jun 2011 10:45:03 +0800
Tag:    v2.1.0

MDL-27759 Fixed conflicts for integration