Merge blocking branch to head.
authorTom Hughes <tom@compton.nu>
Tue, 6 Oct 2009 12:37:49 +0000 (12:37 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 6 Oct 2009 12:37:49 +0000 (12:37 +0000)

Trivial merge