Git merges in Moodle 2.0.1 by Petr Skoda

commit ab127933556717a322061d05e878ff126633bbf8
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 21 Dec 2010 05:59:20 +0800
Tag:    v2.0.1

Merge branch 'xhprof' of git://github.com/stronk7/moodle

commit ab6e79718c20ece6c3ef13bb820db66899976328
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 21 Dec 2010 02:21:20 +0800
Tag:    v2.0.1

Merge branch 'MDL-25632' of git://github.com/samhemelryk/moodle