Merge remote branch 'origin/blead' into blead
Marcus Holland-Moritz [Sun, 7 Mar 2010 15:59:12 +0000 (16:59 +0100)]

Trivial merge